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 /Mk/Uses/qt-dist.mk | |
| parent | devel/cloudabi-toolchain: Drop bogus PORTREVISON variable (diff) | |
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
Notes
Notes:
svn path=/head/; revision=499116
Diffstat (limited to 'Mk/Uses/qt-dist.mk')
| -rw-r--r-- | Mk/Uses/qt-dist.mk | 14 |
1 files changed, 10 insertions, 4 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 |