diff options
Diffstat (limited to 'recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch index 4d15ee06..f855292c 100644 --- a/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch +++ b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch @@ -1,7 +1,7 @@ -From 1ac376893b75c36cc1ee6465e814546e2215354e Mon Sep 17 00:00:00 2001 +From 5168edad24f2c27061286707603bc2126365bcb2 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 08/15] qt_module: Fix pkgconfig replacement +Subject: [PATCH 08/23] qt_module: Fix pkgconfig replacement * in situation like this: QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm @@ -23,14 +23,14 @@ Upstream-Status: Pending Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- - mkspecs/features/qt_module.prf | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) + mkspecs/features/qt_module.prf | 20 ++++++++++++++++---- + 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 3531d28..1c43972 100644 +index 7f7de85..7741b96 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf -@@ -136,18 +136,30 @@ unix|win32-g++* { +@@ -140,18 +140,30 @@ unix|win32-g++* { rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* else: \ rplbase = $$MODULE_BASE_OUTDIR @@ -41,8 +41,9 @@ index 3531d28..1c43972 100644 include_replace.match = $$rplbase/include include_replace.replace = $$[QT_INSTALL_HEADERS/raw] lib_replace.match = $$rplbase/lib - lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +- lib_replace.replace = $$QMAKE_PKGCONFIG_LIBDIR - QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace ++ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] + lafile_replace.match = $$rplbase + lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" + @@ -57,12 +58,13 @@ index 3531d28..1c43972 100644 unix { CONFIG += create_libtool explicitlib - QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] +- QMAKE_LIBTOOL_LIBDIR = $$QMAKE_PKGCONFIG_LIBDIR - QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace -+ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace ++ QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] ++ QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace lafile_replace } unix|win32-g++* { -- -1.8.2.1 +1.8.3.2 |