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-git/0011-qt_module-Fix-paths-in-.prl-files.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-git/0011-qt_module-Fix-paths-in-.prl-files.patch')
-rw-r--r-- | recipes-qt/qt5/qtbase-git/0011-qt_module-Fix-paths-in-.prl-files.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/recipes-qt/qt5/qtbase-git/0011-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-git/0011-qt_module-Fix-paths-in-.prl-files.patch deleted file mode 100644 index 65fd4f5e..00000000 --- a/recipes-qt/qt5/qtbase-git/0011-qt_module-Fix-paths-in-.prl-files.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | From 57da761a8e1995a20250c6600bc99937a7b203b4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Sun, 28 Apr 2013 12:56:55 +0200 | ||
4 | Subject: [PATCH 11/11] qt_module: Fix paths in .prl files | ||
5 | |||
6 | * qmake does not prefix them with QT_SYSROOT when using them | ||
7 | so e.g. when building qtdeclarative we get -L/usr/lib to LINKAGE | ||
8 | variable, which is unsafe for cross-compilation | ||
9 | * writting QT_SYSROOT in .prl files is dangerous for sstate when | ||
10 | builds are in different directories, so we need | ||
11 | SSTATE_SCAN_FILES += "*.pri *.prl" | ||
12 | to make them relocateble | ||
13 | |||
14 | Change-Id: I4b66dcad539a3ba876d8e4ee2eb2ccd626cd03ea | ||
15 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
16 | --- | ||
17 | mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- | ||
18 | 1 file changed, 17 insertions(+), 11 deletions(-) | ||
19 | |||
20 | diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf | ||
21 | index 1c43972..feec2d5 100644 | ||
22 | --- a/mkspecs/features/qt_module.prf | ||
23 | +++ b/mkspecs/features/qt_module.prf | ||
24 | @@ -140,17 +140,23 @@ unix|win32-g++* { | ||
25 | pkgconfig_include_replace.replace = "\$$\\{includedir}" | ||
26 | pkgconfig_lib_replace.match = $$rplbase/lib | ||
27 | pkgconfig_lib_replace.replace = "\$$\\{libdir}" | ||
28 | - include_replace.match = $$rplbase/include | ||
29 | - include_replace.replace = $$[QT_INSTALL_HEADERS/raw] | ||
30 | - lib_replace.match = $$rplbase/lib | ||
31 | - lib_replace.replace = $$[QT_INSTALL_LIBS/raw] | ||
32 | - lafile_replace.match = $$rplbase | ||
33 | - lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" | ||
34 | - | ||
35 | - !isEmpty(SYSROOT): \ | ||
36 | - rplbase = $$[SYSROOT] \ | ||
37 | - lafile_replace.match = $$rplbase \ | ||
38 | - lafile_replace.replace = "=" \ | ||
39 | + !exists($$[QT_SYSROOT]) { | ||
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 | + lafile_replace.match = $$rplbase | ||
45 | + lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]" | ||
46 | + } else { | ||
47 | + # include_replace and lib_replace are duplicate, but we don't want to | ||
48 | + # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional | ||
49 | + include_replace.match = $$rplbase | ||
50 | + include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] | ||
51 | + lib_replace.match = $$rplbase | ||
52 | + lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] | ||
53 | + lafile_replace.match = $$rplbase | ||
54 | + lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" | ||
55 | + } | ||
56 | |||
57 | QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace | ||
58 | QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace | ||
59 | -- | ||
60 | 1.8.2.1 | ||
61 | |||