svn commit: r422785 - head/Mk
Raphael Kubo da Costa
rakuco at FreeBSD.org
Mon Sep 26 17:44:10 UTC 2016
Author: rakuco
Date: Mon Sep 26 17:44:08 2016
New Revision: 422785
URL: https://svnweb.freebsd.org/changeset/ports/422785
Log:
bsd.qt.mk: Use CONFIGURE_WRKSRC instead of WRKSRC in the .qmake.cache hack
WRKSRC is not what we want here: when USES=qmake:outsource is used (such as
in www/webkit-qt5), the build actually takes place in ${WRKDIR}/.build, so
we were creating .qmake.cache in the wrong location and passing the wrong
directory to the linker via -L. With CONFIGURE_WRKSRC, we get the right
value regardless of whether :outsource is used or not.
PR: 212859
Reviewed by: tcberner
MFH: 2016Q3
Modified:
head/Mk/bsd.qt.mk
Modified: head/Mk/bsd.qt.mk
==============================================================================
--- head/Mk/bsd.qt.mk Mon Sep 26 17:34:19 2016 (r422784)
+++ head/Mk/bsd.qt.mk Mon Sep 26 17:44:08 2016 (r422785)
@@ -654,7 +654,8 @@ qt5-pre-configure:
# Since we cannot extract tests/auto/cmake/ and exclude tests/ at the same
# time, we have to disable the check in a cache file (the only way to get this
# value through to the configure script in qtbase).
- ${ECHO_CMD} 'CMAKE_MODULE_TESTS = -' > ${WRKSRC}/.qmake.cache
+ ${MKDIR} ${CONFIGURE_WRKSRC}
+ ${ECHO_CMD} 'CMAKE_MODULE_TESTS = -' > ${CONFIGURE_WRKSRC}/.qmake.cache
# We piggyback on QMAKE_LIBDIR_FLAGS to make sure -L${WRKSRC}/lib is passed to
# the linker before -L/usr/local/lib. By default, the opposite happens, which
# is a problem when a Qt port is being upgraded, since an existing library
@@ -663,7 +664,7 @@ qt5-pre-configure:
# latter to get the linker path order right. qmake is smart enough to strip
# 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${WRKSRC}/lib' >> ${WRKSRC}/.qmake.cache
+ ${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
pre-install: qt-pre-install
qt-pre-install:
More information about the svn-ports-head
mailing list