diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch index 2bbb92cc..062db89d 100644 --- a/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch +++ b/recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch @@ -1,7 +1,7 @@ -From a76a6c33be512a2909904b6136a6044e4b747ffd Mon Sep 17 00:00:00 2001 +From 43305bc5cfe1db5021abb1bf2806dcc63b31f176 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 4/9] qt_module: Fix pkgconfig and libtool replacements +Subject: [PATCH 04/10] qt_module: Fix pkgconfig and libtool replacements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -63,8 +63,8 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- mkspecs/features/qt_common.prf | 2 +- - mkspecs/features/qt_module.prf | 10 ++++++++++ - 2 files changed, 11 insertions(+), 1 deletion(-) + mkspecs/features/qt_module.prf | 11 +++++++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index 38602f6..f9c401f 100644 @@ -80,33 +80,27 @@ index 38602f6..f9c401f 100644 lib_replace.CONFIG = path QMAKE_PRL_INSTALL_REPLACE += lib_replace diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 193629b..38ff9a8 100644 +index e543ea6..0624ce2 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf -@@ -255,6 +255,11 @@ unix|mingw { - pclib_replace.CONFIG = path - QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace - +@@ -273,6 +273,17 @@ load(qt_targets) + ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR + ltlib_replace.CONFIG = path + QMAKE_LIBTOOL_INSTALL_REPLACE += ltlib_replace ++ + pkgconfig_include_replace.match = $$rplbase/include + pkgconfig_include_replace.replace = "\$$\\{includedir}" + pkgconfig_include_replace.CONFIG = path + QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace + - unix { - CONFIG += create_libtool explicitlib - host_build: \ -@@ -266,6 +271,11 @@ unix|mingw { - ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR - ltlib_replace.CONFIG = path - QMAKE_LIBTOOL_INSTALL_REPLACE += ltlib_replace -+ # drop -L/usr/lib in .prl files -+ prl_replace.match = "-L\$${libdir}" -+ prl_replace.replace = "" -+ prl_replace.CONFIG = path -+ QMAKE_PRL_INSTALL_REPLACE += prl_replace - } ++ # drop -L/usr/lib in .prl files ++ prl_replace.match = "-L\$${libdir}" ++ prl_replace.replace = "" ++ prl_replace.CONFIG = path ++ QMAKE_PRL_INSTALL_REPLACE += prl_replace } + contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE -- -2.6.2 +2.7.0 |