Date: Sat, 25 May 2019 20:53:13 +0000 (UTC) From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r502634 - in branches/2019Q2: Mk/Uses devel/qt5-qmake devel/qt5/files Message-ID: <201905252053.x4PKrDTx087639@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tcberner Date: Sat May 25 20:53:13 2019 New Revision: 502634 URL: https://svnweb.freebsd.org/changeset/ports/502634 Log: MFH: r499101 r499116 r502628 Fix build when using GCC. Needed by GCC architectures. Tested for no breakage on amd64 with Clang. PR: 235921 Reviewed by: tcberner Approved by: tcberner (mentor) devel/qt5: Follow-up to r499101 - Move the GCC related path fix into freebsd-g++/qmake.conf Otherwise the inclusion of the GCC path would break clang based systems when gcc-${GCC_DEFAULT} was installed. - This might break GCC architectures again, and if so, that will be fixed in a follow up commit. PR: 235921 qt5: fix build on gcc architectures - the sed call was only replacing one of the %%LOCALBASE%% by ${LOCALBASE}, due to the missing 'g' flag to the sed call. - with this change the gcc architectures should be able to build Qt5 again. PR: 237745 Submitted by: Mark Millard <marklmi26-fbsd@yahoo.com>, jwb Reported by: pkubaj Approved by: ports-secteam (joneum via irc) Added: branches/2019Q2/devel/qt5/files/extrapatch-mkspecs_freebsd-g++_qmake.conf - copied unchanged from r499116, head/devel/qt5/files/extrapatch-mkspecs_freebsd-g++_qmake.conf Modified: branches/2019Q2/Mk/Uses/qt-dist.mk branches/2019Q2/devel/qt5-qmake/Makefile Directory Properties: branches/2019Q2/ (props changed) Modified: branches/2019Q2/Mk/Uses/qt-dist.mk ============================================================================== --- branches/2019Q2/Mk/Uses/qt-dist.mk Sat May 25 20:51:47 2019 (r502633) +++ branches/2019Q2/Mk/Uses/qt-dist.mk Sat May 25 20:53:13 2019 (r502634) @@ -172,7 +172,8 @@ _EXTRA_PATCHES_QT5= ${PORTSDIR}/devel/${_QT_RELNAME}/f ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_common_bsd_bsd.conf . if ${ARCH:Mmips*} || ${ARCH:Mpowerpc*} || ${ARCH} == sparc64 _EXTRA_PATCHES_QT5+= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_g++-base.conf \ - ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf + ${PORTSDIR}/devel/${_QT_RELNAME}/files/extra-patch-mkspecs_common_gcc-base.conf \ + ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-g++_qmake.conf USE_GCC= yes . endif EXTRA_PATCHES?= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-configure \ @@ -249,9 +250,14 @@ _QT5_BASE= core dbus gui network sql widgets .if ${_QT_VER:M5} post-patch: gcc-post-patch gcc-post-patch: - ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/mkspecs/common/gcc-base.conf - ${REINPLACE_CMD} 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|' ${WRKSRC}/mkspecs/common/gcc-base.conf \ - ${WRKSRC}/mkspecs/common/g++-base.conf + ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/mkspecs/common/gcc-base.conf \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf + ${REINPLACE_CMD} 's|%%GCC_DEFAULT%%|${GCC_DEFAULT}|g' \ + ${WRKSRC}/mkspecs/common/gcc-base.conf \ + ${WRKSRC}/mkspecs/common/g++-base.conf \ + ${WRKSRC}/mkspecs/common/bsd/bsd.conf \ + ${WRKSRC}/mkspecs/freebsd-g++/qmake.conf .endif pre-configure: qtbase-pre-configure @@ -321,8 +327,8 @@ qt5-pre-configure: # occurrences of ${WRKSRC}/lib from .pc and .prl files when installing them. # See QTBUG-40825 and ports bugs 194088, 195105 and 198720. ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache - ${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS = ${LOCALBASE}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache - ${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS = ${LOCALBASE}/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache + ${ECHO_CMD} 'QMAKE_DEFAULT_LIBDIRS += ${LOCALBASE}/lib /usr/lib /lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache + ${ECHO_CMD} 'QMAKE_DEFAULT_INCDIRS += ${LOCALBASE}/include /usr/include' >> ${CONFIGURE_WRKSRC}/.qmake.cache post-install: qt-post-install qt-post-install: Modified: branches/2019Q2/devel/qt5-qmake/Makefile ============================================================================== --- branches/2019Q2/devel/qt5-qmake/Makefile Sat May 25 20:51:47 2019 (r502633) +++ branches/2019Q2/devel/qt5-qmake/Makefile Sat May 25 20:53:13 2019 (r502634) @@ -2,6 +2,7 @@ PORTNAME= qmake DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt5- Copied: branches/2019Q2/devel/qt5/files/extrapatch-mkspecs_freebsd-g++_qmake.conf (from r499116, head/devel/qt5/files/extrapatch-mkspecs_freebsd-g++_qmake.conf) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2019Q2/devel/qt5/files/extrapatch-mkspecs_freebsd-g++_qmake.conf Sat May 25 20:53:13 2019 (r502634, copy of r499116, head/devel/qt5/files/extrapatch-mkspecs_freebsd-g++_qmake.conf) @@ -0,0 +1,11 @@ +--- mkspecs/freebsd-g++/qmake.conf.orig 2019-04-16 18:13:12 UTC ++++ mkspecs/freebsd-g++/qmake.conf +@@ -11,6 +11,8 @@ include(../common/bsd/bsd.conf) + QMAKE_INCDIR_POST = /usr/local/include + QMAKE_LIBDIR_POST = /usr/local/lib + ++EXTRA_INCLUDEPATH += %%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%/include %%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%/include/c++ ++ + include(../common/gcc-base-unix.conf) + include(../common/g++-unix.conf) + load(qt_config)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905252053.x4PKrDTx087639>