On 2017/03/01 12:12, Stuart Henderson wrote:
> On 2017/03/01 11:02, Frank Groeneveld wrote:
> > On Tue, Feb 28, 2017, at 14:03, Christian Weisgerber wrote:
> > > textproc/wkhtmltopdf Frank Groeneveld <[email protected]>
> >
> > I've been trying to fix textporc/wkhtmltopdf in the last few days, but
> > can't seem to make qmake use the correct compiler. The do-configure step
> > of this port configures the patched QT that is part of the port. I've
> > tried adding CXX="${CXX}" and/or SYS_CXX="${CXX}" to the env of that
> > step, but it seems to be unused. Anybody got some hints on how to fix
> > this one?
> >
> > Thanks!
> > Frank
> >
>
> It gets further with this, build is still running so there might be
> more needed.
Oops, I forgot to re-run update-patches and had an old one. However
unfortunately
not enough as linking fails.
Index: Makefile
===================================================================
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 13 Sep 2016 18:52:06 -0000 1.12
+++ Makefile 1 Mar 2017 14:13:39 -0000
@@ -39,7 +39,9 @@ LIB_DEPENDS = converters/libiconv \
USE_GMAKE = Yes
MAKE_FLAGS = LIBwkhtmltox_VERSION=${LIBwkhtmltox_VERSION}
-MAKE_ENV += WRKBUILD=${WRKBUILD}
+MAKE_ENV += WRKBUILD=${WRKBUILD} \
+ PORTS_CC="${CC}" PORTS_CXX="${CXX}"
+CONFIGURE_ENV = PORTS_CC="${CC}" PORTS_CXX="${CXX}"
FAKE_FLAGS = INSTALL_ROOT=${WRKINST}${TRUEPREFIX}
SEPARATE_BUILD = Yes
@@ -51,7 +53,7 @@ pre-patch:
cd ${WRKDIR}/${DISTNAME} && mv ../qt-${QT_COMMIT} qt
do-configure:
- mkdir ${WRKBUILD}/qt
+ mkdir -p ${WRKBUILD}/qt
# qt config options taken from scripts/build.py
cd ${WRKBUILD}/qt && \
env -i ${CONFIGURE_ENV} ${WRKSRC}/qt/configure \
Index: patches/patch-qt_mkspecs_openbsd-g++_qmake_conf
===================================================================
RCS file: patches/patch-qt_mkspecs_openbsd-g++_qmake_conf
diff -N patches/patch-qt_mkspecs_openbsd-g++_qmake_conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-qt_mkspecs_openbsd-g++_qmake_conf 1 Mar 2017 14:13:39
-0000
@@ -0,0 +1,36 @@
+$OpenBSD$
+--- qt/mkspecs/openbsd-g++/qmake.conf.orig Tue May 10 09:19:52 2016
++++ qt/mkspecs/openbsd-g++/qmake.conf Wed Mar 1 12:07:44 2017
+@@ -8,7 +8,7 @@ TEMPLATE = app
+ CONFIG += qt warn_on release link_prl gdb_dwarf_index
+ QT += core gui
+
+-QMAKE_CC = gcc
++QMAKE_CC = ${PORTS_CC}
+ QMAKE_LEX = flex
+ QMAKE_LEXFLAGS =
+ QMAKE_YACC = yacc
+@@ -24,7 +24,7 @@ QMAKE_CFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_SHLIB
+ QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
+ QMAKE_CFLAGS_THREAD = -pthread
+
+-QMAKE_CXX = g++
++QMAKE_CXX = ${PORTS_CXX}
+ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
+ QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
+ QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
+@@ -45,10 +45,10 @@ QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
+ QMAKE_INCDIR_OPENGL = /usr/X11R6/include
+ QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
+
+-QMAKE_LINK = g++
+-QMAKE_LINK_SHLIB = g++
+-QMAKE_LINK_C = gcc
+-QMAKE_LINK_C_SHLIB = gcc
++QMAKE_LINK = $$QMAKE_CXX
++QMAKE_LINK_SHLIB = $$QMAKE_CXX
++QMAKE_LINK_C = $$QMAKE_CC
++QMAKE_LINK_C_SHLIB = $$QMAKE_CC
+ QMAKE_LINK_SHLIB_CMD = $$QMAKE_LINK_SHLIB $(LFLAGS) \
+ $$QMAKE_CFLAGS_SHLIB $$QMAKE_LFLAGS \
+ -o $(TARGETD) $(OBJECTS) $(OBJMOC) $(LIBS)
