diff options
| author | Tobias C. Berner <tcberner@FreeBSD.org> | 2019-04-16 19:37:11 +0000 |
|---|---|---|
| committer | Tobias C. Berner <tcberner@FreeBSD.org> | 2019-04-16 19:37:11 +0000 |
| commit | a366f5fb27d2484e8a5f94cb85a2771e46012dc9 (patch) | |
| tree | 961e322fa5b91d752561271098fa618994ede3a6 | |
| parent | 43bceef1b0beb23bfdcd415cd3415d7458408958 (diff) | |
Notes
| -rw-r--r-- | Mk/Uses/qt-dist.mk | 14 | ||||
| -rw-r--r-- | devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf | 4 | ||||
| -rw-r--r-- | devel/qt5/files/extrapatch-mkspecs_freebsd-g++_qmake.conf | 11 |
3 files changed, 22 insertions, 7 deletions
diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk index cc7824a336b5..834d1f06d911 100644 --- a/Mk/Uses/qt-dist.mk +++ b/Mk/Uses/qt-dist.mk @@ -173,7 +173,8 @@ _EXTRA_PATCHES_QT5= ${PORTSDIR}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_fe ${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 diff --git a/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf b/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf index fdbc4b46b2a6..095b3d1e63de 100644 --- a/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf +++ b/devel/qt5/files/extrapatch-mkspecs_common_bsd_bsd.conf @@ -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++ diff --git a/devel/qt5/files/extrapatch-mkspecs_freebsd-g++_qmake.conf b/devel/qt5/files/extrapatch-mkspecs_freebsd-g++_qmake.conf new file mode 100644 index 000000000000..cfb579a4fcf1 --- /dev/null +++ b/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) |