diff options
| author | Piotr Kubaj <pkubaj@FreeBSD.org> | 2019-04-16 17:31:19 +0000 |
|---|---|---|
| committer | Piotr Kubaj <pkubaj@FreeBSD.org> | 2019-04-16 17:31:19 +0000 |
| commit | 7616cd5cd0a75ed4596bcac5bcd52cae020e621d (patch) | |
| tree | f410b2509a3a30b731ed523f714ff0b3616e4210 /Mk/Uses/qt-dist.mk | |
| parent | u-boot: Fix efi booting for arm32 (diff) | |
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)
Notes
Notes:
svn path=/head/; revision=499101
Diffstat (limited to 'Mk/Uses/qt-dist.mk')
| -rw-r--r-- | Mk/Uses/qt-dist.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Mk/Uses/qt-dist.mk b/Mk/Uses/qt-dist.mk index bc9fce1a1ebe..cc7824a336b5 100644 --- a/Mk/Uses/qt-dist.mk +++ b/Mk/Uses/qt-dist.mk @@ -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: |