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 | 66 |
1 files changed, 31 insertions, 35 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 d82fef21..4807df09 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 9d880bebf7efc83495487f8ea9a434956fe98eb0 Mon Sep 17 00:00:00 2001 +From db746d1ca0c41fe3da103d09fc240a0df9db5404 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] 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 @@ -26,7 +26,7 @@ Content-Transfer-Encoding: 8bit * qmake does not prefix them with QT_SYSROOT when using them so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE variable, which is unsafe for cross-compilation -* writing QT_SYSROOT in .prl files is dangerous for sstate when +* writting QT_SYSROOT in .prl files is dangerous for sstate when builds are in different directories, so we need SSTATE_SCAN_FILES += "*.pri *.prl" to make them relocateble @@ -61,11 +61,36 @@ Content-Transfer-Encoding: 8bit Change-Id: Ie1c94b15f2a4e736b65b4d0924d99eb2a7d92a6c Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +Signed-off-by: Jonathan Liu <net147@gmail.com> --- + mkspecs/features/qt.prf | 13 +++++++++++++ mkspecs/features/qt_common.prf | 2 +- - mkspecs/features/qt_module.prf | 11 +++++++++++ - 2 files changed, 12 insertions(+), 1 deletion(-) + 2 files changed, 14 insertions(+), 1 deletion(-) +diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf +index f62b6bb..91be8b3 100644 +--- a/mkspecs/features/qt.prf ++++ b/mkspecs/features/qt.prf +@@ -321,6 +321,19 @@ contains(TEMPLATE, .*app) { + QTPLUGIN = $$manualplugs $$autoplugs + } + ++contains(TEMPLATE, .*lib) { ++ pkgconfig_prefix_replace.match = "prefix=$$[QT_SYSROOT]" ++ pkgconfig_prefix_replace.replace = "prefix=" ++ pkgconfig_prefix_replace.CONFIG = path ++ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_prefix_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 ++} ++ + QT_PLUGIN_VERIFY = DEPLOYMENT_PLUGIN + contains(QT_CONFIG, static) { + QT_PLUGIN_VERIFY += QTPLUGIN diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index 38602f6..f9c401f 100644 --- a/mkspecs/features/qt_common.prf @@ -79,35 +104,6 @@ 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 fdce486..8e7a650 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -259,6 +259,11 @@ load(qt_targets) - pclib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR - pclib_replace.CONFIG = path - QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace -+ -+ pkgconfig_include_replace.match = $$rplbase/include -+ pkgconfig_include_replace.replace = "\$$\\{includedir}" -+ pkgconfig_include_replace.CONFIG = path -+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace - } - !lib_bundle:unix { - CONFIG += create_libtool -@@ -271,6 +276,12 @@ load(qt_targets) - 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 - } - - contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE -- -1.9.1 +2.7.1 |