summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-05-21 22:16:06 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-05-21 22:22:05 +0200
commit35ccafd9c533c423aa7985ec2ce7f0512283c154 (patch)
treed640ca4b1904df2a92e61bd7f3e2ef4a47ae2379 /recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch
parent81b7031859176f24c028c7234d795812bd1a3c95 (diff)
downloadmeta-qt5-35ccafd9c533c423aa7985ec2ce7f0512283c154.tar.gz
qtbase: refresh patches, drop 2 unused
* drop Change-Ids, add Upstream-Status * 0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch was rejected upstream, 0007 was only in meta-qt5/qtbase repo, but wasn't used in recipes * 0004-Disable-mkv8snapshot.patch and 0005-AddSynchoronization-qimagereader.patch are special, because they are applied only to 5.0.0 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch')
-rw-r--r--recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch68
1 files changed, 68 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch
new file mode 100644
index 00000000..d7c8d35a
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch
@@ -0,0 +1,68 @@
1From 8a97079c1b17f27256a4a816e5cc85344c29ac6f Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Sat, 27 Apr 2013 23:15:37 +0200
4Subject: [PATCH 08/12] qt_module: Fix pkgconfig replacement
5
6* in situation like this:
7 QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm
8 QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib
9 QT_INSTALL_LIBS/raw:/usr/lib
10 QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib
11
12 I don't want the replacement like this:
13 sed
14 -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g"
15 -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g"
16 "../../lib/pkgconfig/Qt5Core.pc"
17 >"/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/image/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib/pkgconfig/Qt5Core.pc"
18 because that way I'll end with -L/usr/lib in .pc file which is
19 cross-compile unfriendly, keeping ${libdir}/${includedir} works better
20 in my case
21
22Upstream-Status: Pending
23
24Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
25---
26 mkspecs/features/qt_module.prf | 16 ++++++++++++++--
27 1 file changed, 14 insertions(+), 2 deletions(-)
28
29diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
30index 1132943..7fbfd8d 100644
31--- a/mkspecs/features/qt_module.prf
32+++ b/mkspecs/features/qt_module.prf
33@@ -128,18 +128,30 @@ unix|win32-g++* {
34 rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
35 else: \
36 rplbase = $$MODULE_BASE_OUTDIR
37+ pkgconfig_include_replace.match = $$rplbase/include
38+ pkgconfig_include_replace.replace = "\$$\\{includedir}"
39+ pkgconfig_lib_replace.match = $$rplbase/lib
40+ pkgconfig_lib_replace.replace = "\$$\\{libdir}"
41 include_replace.match = $$rplbase/include
42 include_replace.replace = $$[QT_INSTALL_HEADERS/raw]
43 lib_replace.match = $$rplbase/lib
44 lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
45- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace
46+ lafile_replace.match = $$rplbase
47+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]"
48+
49+ !isEmpty(SYSROOT): \
50+ rplbase = $$[SYSROOT] \
51+ lafile_replace.match = $$rplbase \
52+ lafile_replace.replace = "=" \
53+
54+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace
55 QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
56 }
57
58 unix {
59 CONFIG += create_libtool explicitlib
60 QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw]
61- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
62+ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace
63 }
64
65 unix|win32-g++* {
66--
671.8.2.1
68