diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-21 22:16:06 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-05-21 22:22:05 +0200 |
| commit | 35ccafd9c533c423aa7985ec2ce7f0512283c154 (patch) | |
| tree | d640ca4b1904df2a92e61bd7f3e2ef4a47ae2379 /recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch | |
| parent | 81b7031859176f24c028c7234d795812bd1a3c95 (diff) | |
| download | meta-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/0009-qt_module-Fix-pkgconfig-replacement.patch')
| -rw-r--r-- | recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch | 67 |
1 files changed, 0 insertions, 67 deletions
diff --git a/recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch deleted file mode 100644 index 0574ca89..00000000 --- a/recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch +++ /dev/null | |||
| @@ -1,67 +0,0 @@ | |||
| 1 | From 4ba266bc0a7e4841cfd06d555b39888928a6e3a5 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 3 | Date: Sat, 27 Apr 2013 23:15:37 +0200 | ||
| 4 | Subject: [PATCH 09/11] 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 | |||
| 22 | Change-Id: Id0f9143c012b7fe7bb7bab0055687f4e0517f653 | ||
| 23 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
| 24 | --- | ||
| 25 | mkspecs/features/qt_module.prf | 16 ++++++++++++++-- | ||
| 26 | 1 file changed, 14 insertions(+), 2 deletions(-) | ||
| 27 | |||
| 28 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf | ||
| 29 | index 50e9469..9532377 100644 | ||
| 30 | --- a/mkspecs/features/qt_module.prf | ||
| 31 | +++ b/mkspecs/features/qt_module.prf | ||
| 32 | @@ -191,18 +191,30 @@ unix|win32-g++* { | ||
| 33 | rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* | ||
| 34 | else: \ | ||
| 35 | rplbase = $$[QT_INSTALL_PREFIX/get] | ||
| 36 | + pkgconfig_include_replace.match = $$rplbase/include | ||
| 37 | + pkgconfig_include_replace.replace = "\$$\\{includedir}" | ||
| 38 | + pkgconfig_lib_replace.match = $$rplbase/lib | ||
| 39 | + pkgconfig_lib_replace.replace = "\$$\\{libdir}" | ||
| 40 | include_replace.match = $$rplbase/include | ||
| 41 | include_replace.replace = $$[QT_INSTALL_HEADERS/raw] | ||
| 42 | lib_replace.match = $$rplbase/lib | ||
| 43 | lib_replace.replace = $$[QT_INSTALL_LIBS/raw] | ||
| 44 | - QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace | ||
| 45 | + lafile_replace.match = $$rplbase | ||
| 46 | + lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" | ||
| 47 | + | ||
| 48 | + !isEmpty(SYSROOT): \ | ||
| 49 | + rplbase = $$[SYSROOT] \ | ||
| 50 | + lafile_replace.match = $$rplbase \ | ||
| 51 | + lafile_replace.replace = "=" \ | ||
| 52 | + | ||
| 53 | + QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace | ||
| 54 | } | ||
| 55 | |||
| 56 | unix { | ||
| 57 | CONFIG += create_libtool explicitlib | ||
| 58 | QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace | ||
| 59 | QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] | ||
| 60 | - QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace | ||
| 61 | + QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace | ||
| 62 | } | ||
| 63 | |||
| 64 | unix|win32-g++* { | ||
| 65 | -- | ||
| 66 | 1.8.2.1 | ||
| 67 | |||
