From owner-svn-ports-all@freebsd.org Tue Apr 16 19:37:13 2019 Return-Path: Delivered-To: svn-ports-all@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 498B7157B22F; Tue, 16 Apr 2019 19:37:13 +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 D8B557483B; Tue, 16 Apr 2019 19:37:12 +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 AE14024266; Tue, 16 Apr 2019 19:37:12 +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 x3GJbCHv003766; Tue, 16 Apr 2019 19:37:12 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3GJbCGx003763; Tue, 16 Apr 2019 19:37:12 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201904161937.x3GJbCGx003763@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Tue, 16 Apr 2019 19:37:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499116 - in head: Mk/Uses devel/qt5/files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head: Mk/Uses devel/qt5/files X-SVN-Commit-Revision: 499116 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D8B557483B 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.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.978,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Apr 2019 19:37:13 -0000 Author: tcberner Date: Tue Apr 16 19:37:11 2019 New Revision: 499116 URL: https://svnweb.freebsd.org/changeset/ports/499116 Log: 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 Added: head/devel/qt5/files/extrapatch-mkspecs_freebsd-g++_qmake.conf (contents, props changed) Modified: head/Mk/Uses/qt-dist.mk head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf Modified: head/Mk/Uses/qt-dist.mk ============================================================================== --- head/Mk/Uses/qt-dist.mk Tue Apr 16 19:20:52 2019 (r499115) +++ head/Mk/Uses/qt-dist.mk Tue Apr 16 19:37:11 2019 (r499116) @@ -173,7 +173,8 @@ _EXTRA_PATCHES_QT5= ${PORTSDIR}/devel/${_QT_RELNAME}/f ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_freebsd-clang_qmake.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 \ @@ -250,9 +251,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}|g' ${WRKSRC}/mkspecs/common/gcc-base.conf \ - ${WRKSRC}/mkspecs/common/g++-base.conf ${WRKSRC}/mkspecs/common/bsd/bsd.conf + ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${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 Modified: head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf ============================================================================== --- head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf Tue Apr 16 19:20:52 2019 (r499115) +++ head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf Tue Apr 16 19:37:11 2019 (r499116) @@ -1,6 +1,6 @@ --- mkspecs/common/bsd/bsd.conf.orig 2017-07-23 16:27:40 UTC +++ mkspecs/common/bsd/bsd.conf -@@ -21,6 +21,29 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm +@@ -21,6 +21,27 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_THREAD = @@ -28,5 +28,3 @@ QMAKE_AR = ar cqs QMAKE_OBJCOPY = objcopy QMAKE_NM = nm -P -+ -+EXTRA_INCLUDEPATH += %%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%/include %%LOCALBASE%%/lib/gcc%%GCC_DEFAULT%%/include/c++ Added: head/devel/qt5/files/extrapatch-mkspecs_freebsd-g++_qmake.conf ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/qt5/files/extrapatch-mkspecs_freebsd-g++_qmake.conf Tue Apr 16 19:37:11 2019 (r499116) @@ -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)