diff options
| -rw-r--r-- | x11-toolkits/qt5-quick/Makefile | 19 | ||||
| -rw-r--r-- | x11-toolkits/qt5-quick/files/patch-src__src.pro | 22 |
2 files changed, 19 insertions, 22 deletions
diff --git a/x11-toolkits/qt5-quick/Makefile b/x11-toolkits/qt5-quick/Makefile index 938abe482746..c0d4b921fdee 100644 --- a/x11-toolkits/qt5-quick/Makefile +++ b/x11-toolkits/qt5-quick/Makefile @@ -17,4 +17,23 @@ USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL} QT_DEFINES= ACCESSIBILITY QT_CONFIG= accessibility accessibility-atspi-bridge +# libQt5Qml.so and libQt5QmlDevTools.a come from lang/qt5-qml, so we do not +# want to build them again here. On the other hand, if we just remove qml/ and +# qmldevtools/ from src/src.pro the versions installed in ${LOCALBASE} will be +# picked up and their .pri files will make -Wl,-rpath-link,${LOCALBASE}/lib be +# used when building targets such as tools/qmltestrunner. This causes problems +# when building the port with an older version installed (bug 194870). +# Instead, we let the .pri modules be created in ${WRKSRC}/mkspecs but symlink +# the existing libraries and trick the existing Makefiles into doing nothing +# (it is more future-proof than whitelisting the other directories). +post-configure: + ${LN} -s ${QT_LIBDIR}/libQt5Qml.so \ + ${CONFIGURE_WRKSRC}/lib/libQt5Qml.so + ${LN} -s ${QT_LIBDIR}/libQt5QmlDevTools.a \ + ${CONFIGURE_WRKSRC}/lib/libQt5QmlDevTools.a + ${PRINTF} ".DEFAULT:\n\t@${DO_NADA}" \ + > ${CONFIGURE_WRKSRC}/src/qml/Makefile + ${PRINTF} ".DEFAULT:\n\t@${DO_NADA}" \ + > ${CONFIGURE_WRKSRC}/src/qmldevtools/Makefile + .include <bsd.port.mk> diff --git a/x11-toolkits/qt5-quick/files/patch-src__src.pro b/x11-toolkits/qt5-quick/files/patch-src__src.pro deleted file mode 100644 index 6bcdf731fb52..000000000000 --- a/x11-toolkits/qt5-quick/files/patch-src__src.pro +++ /dev/null @@ -1,22 +0,0 @@ -Only enter the directories we want to build, otherwise we might fail due to -missing dependencies. - ---- src/src.pro -+++ src/src.pro -@@ -1,7 +1,5 @@ - TEMPLATE = subdirs - CONFIG += ordered --SUBDIRS += \ -- qml - - qtHaveModule(gui):contains(QT_CONFIG, opengl(es1|es2)?) { - SUBDIRS += \ -@@ -14,7 +12,4 @@ qtHaveModule(gui):contains(QT_CONFIG, opengl(es1|es2)?) { - - SUBDIRS += \ - plugins \ -- imports \ -- qmldevtools -- --qmldevtools.CONFIG = host_build -+ imports |