svn commit: r499116 - in head: Mk/Uses devel/qt5/files

[Tobias C. Berner]

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)