On Sun, Mar 08, 2020 at 12:59:30PM +0000, Stuart Henderson wrote:
> On 2020/03/08 12:40, Stuart Henderson wrote:
> > py-sip-qt5 attached for completeness, it is the same as the last one from
> > Landry. OK sthen@ to import that unhooked, then we can hook it to the build
> > when switching over.
> 
> py-sip-qt5 needs this added:
> 
> MAKE_FLAGS +=           CC="${CC}" CXX="${CXX}"
> 

i had it fixed locally by amending the existing patch copied from
py-sip:

$OpenBSD: patch-specs_openbsd-g++,v 1.2 2017/03/02 15:10:15 espie Exp $
Index: specs/openbsd-g++
--- specs/openbsd-g++.orig
+++ specs/openbsd-g++
@@ -7,7 +7,7 @@ TEMPLATE                = app
 CONFIG                 += qt warn_on release link_prl
 QT                     += core gui
 
-QMAKE_CC               = gcc
+QMAKE_CC               = cc
 QMAKE_LEX              = flex
 QMAKE_LEXFLAGS         =
 QMAKE_YACC             = yacc
@@ -22,7 +22,7 @@ QMAKE_CFLAGS_SHLIB    = -fPIC
 QMAKE_CFLAGS_YACC      = -Wno-unused -Wno-parentheses
 QMAKE_CFLAGS_THREAD    = -pthread
 
-QMAKE_CXX              = g++
+QMAKE_CXX              = c++
 QMAKE_CXXFLAGS         = $$QMAKE_CFLAGS
 QMAKE_CXXFLAGS_DEPS    = $$QMAKE_CFLAGS_DEPS
 QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON

but i'm fine with MAKE_FLAGS too - fixed version attached.

still uncertain on the naming ? x11/py-sip-qt5 ? upstream names it PyQt5-sip...
py-qt5-sip ? who cares ?

going to start an amd64 bulk with your patchset, but i agree we should commit
this soonish to avoid more churn. I'm globally okay with the patchset anyway,
and all the consumers i tested were fine (except tortoisehg but i suppose its
local as it works for rafael)

Landry

Attachment: py-sip-qt5_2.tgz
Description: application/tar-gz

Reply via email to