svn commit: r445316 - head/Mk
Raphael Kubo da Costa
rakuco at FreeBSD.org
Sat Jul 8 10:44:15 UTC 2017
Author: rakuco
Date: Sat Jul 8 10:44:13 2017
New Revision: 445316
URL: https://svnweb.freebsd.org/changeset/ports/445316
Log:
Fix qt5-websockets-qml's dependency path in bsd.qt.mk.
libdeclarative_qmlwebsockets.so is not installed into ${QT_LIBDIR}, which
causes the dependency logic in bsd.qt.mk to actually do something equivalent to
this instead:
BUILD_DEPENDS+= ${QT_LIBDIR}/${QT_QMLDIR}/QtWebSockets/libdeclarative_qmlwebsockets.so:www/qt5-websockets-qml
RUN_DEPENDS+= ${QT_LIBDIR}/${QT_QMLDIR}/QtWebSockets/libdeclarative_qmlwebsockets.so:www/qt5-websockets-qml
which translates into something like
/usr/local/lib/qt5//usr/local/lib/qt5/qml/QtWebSockets/libdeclarative_qmlwebsockets.so:www/qt5-websockets-qml
which obviously does not exist.
Instead of settin websockets-qml_LIB, set websockets-qml_PATH like we do for
other QML ports, so that our dependency logic does not needlessly prepend
${QT_LIBDIR} there. This fixes devel/qt5's build.
PR: 220045
Modified:
head/Mk/bsd.qt.mk
Modified: head/Mk/bsd.qt.mk
==============================================================================
--- head/Mk/bsd.qt.mk Sat Jul 8 10:32:22 2017 (r445315)
+++ head/Mk/bsd.qt.mk Sat Jul 8 10:44:13 2017 (r445316)
@@ -596,7 +596,7 @@ websockets_PORT= www/${_QT_RELNAME}-websockets
websockets_LIB= libQt${_QT_LIBVER}WebSockets.so
websockets-qml_PORT= www/${_QT_RELNAME}-websockets-qml
-websockets-qml_LIB= ${QT_QMLDIR}/QtWebSockets/libdeclarative_qmlwebsockets.so
+websockets-qml_PATH= ${QT_QMLDIR}/QtWebSockets/qmldir
webkit_PORT= www/${_QT_RELNAME}-webkit
webkit_LIB= libQt${_QT_LIBVER}WebKit.so
More information about the svn-ports-all
mailing list