Page MenuHomeFreeBSD
Files F148367138

D8713.id.diff
No OneTemporary
Actions

D8713.id.diff
View Options

Index: head/Mk/bsd.qt.mk
===================================================================
--- head/Mk/bsd.qt.mk
+++ head/Mk/bsd.qt.mk
@@ -170,13 +170,14 @@
. if ${QT_DIST} == "base" || ${_QT_VERSION:M4*}
. if ${_QT_VERSION:M4*}
-_EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h
+_EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h \
+ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool
. else
-_EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_global_qcompilerdetection.h
+_EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_global_qcompilerdetection.h \
+ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf
. endif
EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \
${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \
- ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool \
${_EXTRA_PATCHES_QT4} ${_EXTRA_PATCHES_QT5}
. endif
@@ -683,13 +684,6 @@
# See QTBUG-40825 and ports bugs 194088, 195105 and 198720.
${ECHO_CMD} 'QMAKE_LIBDIR_FLAGS = -L${CONFIGURE_WRKSRC}/lib' >> ${CONFIGURE_WRKSRC}/.qmake.cache
-pre-install: qt-pre-install
-qt-pre-install:
-# Search both in CONFIGURE_WRKSRC and WRKSRC, as the former is not
-# a subdirectory of the latter for out-of-source builds.
- @${FIND} ${WRKSRC} ${CONFIGURE_WRKSRC} -name "Makefile*" -type f | \
- ${XARGS} ${REINPLACE_CMD} -e 's,${PREFIX}/${QT_LIBDIR_REL}/pkgconfig,${PREFIX}/libdata/pkgconfig,g'
-
post-install: qt-post-install
qt-post-install:
. if ${QT_DEFINES:N-*}
Index: head/devel/qt5/files/extrapatch-libtool
===================================================================
--- head/devel/qt5/files/extrapatch-libtool
+++ head/devel/qt5/files/extrapatch-libtool
@@ -1,10 +0,0 @@
---- mkspecs/features/qt_module.prf.orig 2016-02-24 21:20:22.414067000 +0100
-+++ mkspecs/features/qt_module.prf 2016-02-24 21:20:35.884538000 +0100
-@@ -267,7 +267,6 @@
- QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace
- }
- !lib_bundle:unix {
-- CONFIG += create_libtool
- host_build: \
- QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS]
- else: \
Index: head/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf
===================================================================
--- head/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf
+++ head/devel/qt5/files/extrapatch-mkspecs_features_qt__module.prf
@@ -0,0 +1,26 @@
+The first hunk fixes the install location of the pkconfig files:
+ FreeBSD installs pkgconfig files to $LOCALBASE/libdata/pkgconfig
+ qmake uses QMAKE_PKGCONFIG_DESTDIR as relative path to $$QT_LIBDIR
+ respectively as absolute path.
+
+The second hunk stops qmake from generating la files.
+
+--- mkspecs/features/qt_module.prf.orig 2016-09-16 05:49:42 UTC
++++ mkspecs/features/qt_module.prf
+@@ -247,7 +247,7 @@ load(qt_targets)
+ # this builds on top of qt_common
+ !internal_module:!lib_bundle:if(unix|mingw) {
+ CONFIG += create_pc
+- QMAKE_PKGCONFIG_DESTDIR = pkgconfig
++ QMAKE_PKGCONFIG_DESTDIR = ../libdata/pkgconfig
+ host_build: \
+ QMAKE_PKGCONFIG_LIBDIR = $$[QT_HOST_LIBS]
+ else: \
+@@ -267,7 +267,6 @@ load(qt_targets)
+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace
+ }
+ !lib_bundle:unix {
+- CONFIG += create_libtool
+ host_build: \
+ QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS]
+ else: \

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 18, 9:52 AM (9 h, 12 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29898410
Default Alt Text
D8713.id.diff (3 KB)

Event Timeline