From owner-svn-ports-head@freebsd.org Tue Apr 16 17:31:20 2019 Return-Path: Delivered-To: svn-ports-head@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 647621578871; Tue, 16 Apr 2019 17:31:20 +0000 (UTC) (envelope-from pkubaj@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 08F336F440; Tue, 16 Apr 2019 17:31:20 +0000 (UTC) (envelope-from pkubaj@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 C210122C95; Tue, 16 Apr 2019 17:31:19 +0000 (UTC) (envelope-from pkubaj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3GHVJpk030180; Tue, 16 Apr 2019 17:31:19 GMT (envelope-from pkubaj@FreeBSD.org) Received: (from pkubaj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3GHVJ1X030178; Tue, 16 Apr 2019 17:31:19 GMT (envelope-from pkubaj@FreeBSD.org) Message-Id: <201904161731.x3GHVJ1X030178@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to pkubaj@FreeBSD.org using -f From: Piotr Kubaj Date: Tue, 16 Apr 2019 17:31:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499101 - in head: Mk/Uses devel/qt5/files X-SVN-Group: ports-head X-SVN-Commit-Author: pkubaj X-SVN-Commit-Paths: in head: Mk/Uses devel/qt5/files X-SVN-Commit-Revision: 499101 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 08F336F440 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_SHORT(-0.98)[-0.981,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-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Apr 2019 17:31:20 -0000 Author: pkubaj Date: Tue Apr 16 17:31:19 2019 New Revision: 499101 URL: https://svnweb.freebsd.org/changeset/ports/499101 Log: 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) 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 17:10:02 2019 (r499100) +++ head/Mk/Uses/qt-dist.mk Tue Apr 16 17:31:19 2019 (r499101) @@ -251,8 +251,8 @@ _QT5_BASE= core dbus gui network sql widgets 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|%%GCC_DEFAULT%%|${GCC_DEFAULT}|g' ${WRKSRC}/mkspecs/common/gcc-base.conf \ + ${WRKSRC}/mkspecs/common/g++-base.conf ${WRKSRC}/mkspecs/common/bsd/bsd.conf .endif pre-configure: qtbase-pre-configure @@ -323,8 +323,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: head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf ============================================================================== --- head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf Tue Apr 16 17:10:02 2019 (r499100) +++ head/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf Tue Apr 16 17:31:19 2019 (r499101) @@ -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,27 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm +@@ -21,6 +21,29 @@ QMAKE_LIBS_X11 = -lXext -lX11 -lm QMAKE_LIBS_OPENGL = -lGL QMAKE_LIBS_THREAD = @@ -28,3 +28,5 @@ 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++