From owner-svn-ports-branches@freebsd.org Sat May 25 20:53:14 2019 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D09315B609B; Sat, 25 May 2019 20:53:14 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0CD6D88EA9; Sat, 25 May 2019 20:53:14 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DA3E49AA2; Sat, 25 May 2019 20:53:13 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4PKrDQo087642; Sat, 25 May 2019 20:53:13 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4PKrDTx087639; Sat, 25 May 2019 20:53:13 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201905252053.x4PKrDTx087639@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sat, 25 May 2019 20:53:13 +0000 (UTC) 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 X-SVN-Group: ports-branches X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in branches/2019Q2: Mk/Uses devel/qt5-qmake devel/qt5/files X-SVN-Commit-Revision: 502634 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0CD6D88EA9 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.99)[-0.986,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 May 2019 20:53:14 -0000 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 , 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)