From 35ccafd9c533c423aa7985ec2ce7f0512283c154 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 21 May 2013 22:16:06 +0200 Subject: 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 --- .../0001-Add-linux-oe-g-platform.patch | 3 +- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 5 +- .../0003-Add-external-hostbindir-option.patch | 12 ++-- ...4-qmake-is-already-built-in-qtbase-native.patch | 30 -------- ..._functions-temporary-remove-isEmpty-check.patch | 50 +++++++++++++ ...-building-a-separate-qmake-for-the-target.patch | 29 -------- ...5-qmake-is-already-built-in-qtbase-native.patch | 30 ++++++++ ...-building-a-separate-qmake-for-the-target.patch | 29 ++++++++ ..._functions-temporary-remove-isEmpty-check.patch | 46 ------------ ...p-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 31 ++++++++ ...p-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 30 -------- .../0008-qt_module-Fix-pkgconfig-replacement.patch | 68 ++++++++++++++++++ .../0009-qt_module-Fix-paths-in-.prl-files.patch | 62 ++++++++++++++++ .../0009-qt_module-Fix-pkgconfig-replacement.patch | 67 ------------------ ...rty-rename-QT_INSTALL_CONFIGURATION-to-QT.patch | 34 --------- ...0010-wayland-scanner-disable-silent-rules.patch | 46 ++++++++++++ ...on-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch | 44 ++++++++++++ .../0011-qt_module-Fix-paths-in-.prl-files.patch | 61 ---------------- ....prf-Allow-to-add-extra-arguments-to-make.patch | 37 ++++++++++ ...0012-wayland-scanner-disable-silent-rules.patch | 45 ------------ ...on-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch | 43 ------------ ....prf-Allow-to-add-extra-arguments-to-make.patch | 35 --------- .../qtbase-git/0001-Add-linux-oe-g-platform.patch | 3 +- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 5 +- .../0003-Add-external-hostbindir-option.patch | 12 ++-- ...4-qmake-is-already-built-in-qtbase-native.patch | 30 -------- ..._functions-temporary-remove-isEmpty-check.patch | 51 ++++++++++++++ ...-building-a-separate-qmake-for-the-target.patch | 29 -------- ...5-qmake-is-already-built-in-qtbase-native.patch | 30 ++++++++ ...-building-a-separate-qmake-for-the-target.patch | 29 ++++++++ ..._functions-temporary-remove-isEmpty-check.patch | 47 ------------- ...p-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 29 ++++++++ ...p-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 29 -------- .../0008-qt_module-Fix-pkgconfig-replacement.patch | 68 ++++++++++++++++++ .../0009-qt_module-Fix-paths-in-.prl-files.patch | 62 ++++++++++++++++ .../0009-qt_module-Fix-pkgconfig-replacement.patch | 67 ------------------ ...rty-rename-QT_INSTALL_CONFIGURATION-to-QT.patch | 33 --------- ...0010-wayland-scanner-disable-silent-rules.patch | 82 ++++++++++++++++++++++ ...on-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch | 44 ++++++++++++ .../0011-qt_module-Fix-paths-in-.prl-files.patch | 61 ---------------- ....prf-Allow-to-add-extra-arguments-to-make.patch | 37 ++++++++++ ...0012-wayland-scanner-disable-silent-rules.patch | 81 --------------------- ...on-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch | 43 ------------ ....prf-Allow-to-add-extra-arguments-to-make.patch | 35 --------- recipes-qt/qt5/qtbase-native.inc | 20 +++--- recipes-qt/qt5/qtbase.inc | 19 +++-- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 3 +- ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 5 +- .../0003-Add-external-hostbindir-option.patch | 12 ++-- ...4-qmake-is-already-built-in-qtbase-native.patch | 30 -------- ..._functions-temporary-remove-isEmpty-check.patch | 50 +++++++++++++ ...-building-a-separate-qmake-for-the-target.patch | 29 -------- ...5-qmake-is-already-built-in-qtbase-native.patch | 30 ++++++++ ...-building-a-separate-qmake-for-the-target.patch | 29 ++++++++ ..._functions-temporary-remove-isEmpty-check.patch | 46 ------------ ...p-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 29 ++++++++ ...p-Prefix-default-LIBDIRS-and-INCDIRS-with.patch | 29 -------- .../0008-qt_module-Fix-pkgconfig-replacement.patch | 68 ++++++++++++++++++ .../0009-qt_module-Fix-paths-in-.prl-files.patch | 62 ++++++++++++++++ .../0009-qt_module-Fix-pkgconfig-replacement.patch | 67 ------------------ ...rty-rename-QT_INSTALL_CONFIGURATION-to-QT.patch | 33 --------- ...0010-wayland-scanner-disable-silent-rules.patch | 46 ++++++++++++ ...on-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch | 44 ++++++++++++ .../0011-qt_module-Fix-paths-in-.prl-files.patch | 61 ---------------- ....prf-Allow-to-add-extra-arguments-to-make.patch | 37 ++++++++++ ...0012-wayland-scanner-disable-silent-rules.patch | 45 ------------ ...on-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch | 43 ------------ ....prf-Allow-to-add-extra-arguments-to-make.patch | 35 --------- 68 files changed, 1274 insertions(+), 1342 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0004-qmake-is-already-built-in-qtbase-native.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0005-Allow-building-a-separate-qmake-for-the-target.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0006-qt_functions-temporary-remove-isEmpty-check.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0008-qt_module-Fix-pkgconfig-replacement.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-pkgconfig-replacement.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0011-qt_module-Fix-paths-in-.prl-files.patch create mode 100644 recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0012-wayland-scanner-disable-silent-rules.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch delete mode 100644 recipes-qt/qt5/qtbase-5.0.2/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch create mode 100644 recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch create mode 100644 recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch create mode 100644 recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch create mode 100644 recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch create mode 100644 recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch create mode 100644 recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-pkgconfig-replacement.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch create mode 100644 recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch create mode 100644 recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0011-qt_module-Fix-paths-in-.prl-files.patch create mode 100644 recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0012-wayland-scanner-disable-silent-rules.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch delete mode 100644 recipes-qt/qt5/qtbase-git/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch delete mode 100644 recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch create mode 100644 recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch delete mode 100644 recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch create mode 100644 recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch create mode 100644 recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch delete mode 100644 recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch create mode 100644 recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch delete mode 100644 recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch create mode 100644 recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch create mode 100644 recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch delete mode 100644 recipes-qt/qt5/qtbase/0009-qt_module-Fix-pkgconfig-replacement.patch delete mode 100644 recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch create mode 100644 recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch create mode 100644 recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch delete mode 100644 recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch create mode 100644 recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch delete mode 100644 recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch delete mode 100644 recipes-qt/qt5/qtbase/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch delete mode 100644 recipes-qt/qt5/qtbase/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch diff --git a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch index 1cd7dd60..eaa64515 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 231e94888c257da84bd39b138f5010c255387ae3 Mon Sep 17 00:00:00 2001 +From d64321c240cbb949b9e55e2cd448c78bf9865c56 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH 01/12] Add linux-oe-g++ platform @@ -31,7 +31,6 @@ Subject: [PATCH 01/12] Add linux-oe-g++ platform Upstream-Status: Pending -Change-Id: I464fe8f17fa4ed4c80165183daf79b08fc491697 Signed-off-by: Martin Jansa --- configure | 54 ++++++++++++++++--- diff --git a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index be7813ae..38aeb221 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,7 +1,7 @@ -From 5ba803e0ad0883ff6abc0e1efa1bf3ac3765348d Mon Sep 17 00:00:00 2001 +From 542325db6c9e9e2ffc2390b8eb1f8b16e674ca41 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/14] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside using the environment Allow to set a qt.conf from the outside using the environment. This allows @@ -10,7 +10,6 @@ the same qmake binary to build qt/x11 and qt/embedded Upstream-Status: Pending -Change-Id: Ice5b16b3e3f6ba2c6cff7bd055d074628ab3aed0 Signed-off-by: Martin Jansa --- src/corelib/global/qlibraryinfo.cpp | 5 ++++- diff --git a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch index e44d7381..cd63c449 100644 --- a/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-5.0.2/0003-Add-external-hostbindir-option.patch @@ -1,13 +1,15 @@ -From 79f1b015148779b92dc6e65dffd297b8b9522f79 Mon Sep 17 00:00:00 2001 +From 943c30aa55fbf1e330e7c987e989ddbd656e69c0 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/11] Add -external-hostbindir option +Subject: [PATCH 03/12] Add -external-hostbindir option * when cross-compiling it's sometimes useful to use existing tools from machine (or in OpenEmbedded built with separate native recipe) when building for target * this way we can skip bootstraping tools we already have +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- configure | 15 ++++++++++++++- @@ -156,10 +158,10 @@ index 4c41cff..997ea6d 100644 # If we are doing a prefix build, create a "module" pri which enables diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index acd11f5..bba0861 100644 +index 6b40731..139a60f 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -272,7 +272,7 @@ QLibraryInfo::isDebugBuild() +@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild() */ static const struct { @@ -168,7 +170,7 @@ index acd11f5..bba0861 100644 } qtConfEntries[] = { { "Prefix", "." }, { "Documentation", "doc" }, // should be ${Data}/doc -@@ -297,6 +297,7 @@ static const struct { +@@ -295,6 +295,7 @@ static const struct { { "HostPrefix", "" }, { "HostBinaries", "bin" }, { "HostData", "." }, diff --git a/recipes-qt/qt5/qtbase-5.0.2/0004-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-5.0.2/0004-qmake-is-already-built-in-qtbase-native.patch deleted file mode 100644 index 93cd334d..00000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0004-qmake-is-already-built-in-qtbase-native.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 1dd6ee9bb2aafb8d77d9c7e465b9cf6d778bc283 Mon Sep 17 00:00:00 2001 -From: Michael Krelin -Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 04/11] qmake is already built in qtbase-native - -Ported from OE by: Yu Ke -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 1ca5b4e..546bed2 100755 ---- a/configure -+++ b/configure -@@ -3667,7 +3667,7 @@ setBootstrapEvalVariable() - - - # build qmake --if true; then ###[ '!' -f "$outpath/bin/qmake" ]; -+if false; then ###[ '!' -f "$outpath/bin/qmake" ]; - echo "Creating qmake..." - - mkdir -p "$outpath/qmake" || exit --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch new file mode 100644 index 00000000..7941ef97 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0004-qt_functions-temporary-remove-isEmpty-check.patch @@ -0,0 +1,50 @@ +From 2a3c7bb40de7ae8f060e69bdaa77522172101f00 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 17 Apr 2013 18:06:25 +0200 +Subject: [PATCH 04/12] qt_functions: temporary remove isEmpty check + +* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value +* isEmpty works correctly only with qmake variables (e.g. $$FOO - + isEmpty(FOO)), but doesn't work with system properties like $$[FOO]. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_functions.prf | 6 +++++- + mkspecs/features/qt_tool.prf | 2 +- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index 876f657..0e094a8 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) { + $$1 = $$eval(QT_TOOL.$${2}.command) + isEmpty($$1) { + $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 +- isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ # for some reason isEmpty does not work here, FIXME before submitting upstream ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch ++ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { + $$1 = $$[QT_HOST_BINS]/$$2 + } + contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { +diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf +index 8a636c7..0dad97c 100644 +--- a/mkspecs/features/qt_tool.prf ++++ b/mkspecs/features/qt_tool.prf +@@ -31,7 +31,7 @@ load(qt_targets) + + # If we are doing a prefix build, create a "module" pri which enables + # qtPrepareTool() to work with the non-installed build. +-!build_pass:force_independent:isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++!build_pass:force_independent:!exists($$[QT_EXTERNAL_HOST_BINS]) { + + isEmpty(MODULE):MODULE = $$TARGET + +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0005-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-5.0.2/0005-Allow-building-a-separate-qmake-for-the-target.patch deleted file mode 100644 index 3889ab13..00000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0005-Allow-building-a-separate-qmake-for-the-target.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 41ee07272cea21621c26ddeb02a3756e94b29f9a Mon Sep 17 00:00:00 2001 -From: Paul Eggleton -Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 05/11] Allow building a separate qmake for the target - -Upstream-Status: Inappropriate [config] - -Signed-off-by: Paul Eggleton -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - qmake/qmake.pro | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/qmake/qmake.pro b/qmake/qmake.pro -index 0d92ac2..9be0e9b 100644 ---- a/qmake/qmake.pro -+++ b/qmake/qmake.pro -@@ -9,6 +9,7 @@ CONFIG -= qt shared app_bundle uic - DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \ - PROEVALUATOR_FULL PROEVALUATOR_DEBUG - DESTDIR = ../bin/ -+TARGET = qmake - - OBJECTS_DIR = . - MOC_DIR = . --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch new file mode 100644 index 00000000..d2418fc6 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0005-qmake-is-already-built-in-qtbase-native.patch @@ -0,0 +1,30 @@ +From 7b37f7fa8c68c1807eeb45936154a42c34cda666 Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Mon, 29 Oct 2012 20:07:49 -0700 +Subject: [PATCH 05/12] qmake is already built in qtbase-native + +Ported from OE by: Yu Ke +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 1ca5b4e..546bed2 100755 +--- a/configure ++++ b/configure +@@ -3667,7 +3667,7 @@ setBootstrapEvalVariable() + + + # build qmake +-if true; then ###[ '!' -f "$outpath/bin/qmake" ]; ++if false; then ###[ '!' -f "$outpath/bin/qmake" ]; + echo "Creating qmake..." + + mkdir -p "$outpath/qmake" || exit +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch new file mode 100644 index 00000000..fe03edcd --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0006-Allow-building-a-separate-qmake-for-the-target.patch @@ -0,0 +1,29 @@ +From 76537aca4118f5f7c336b7d17594c9644b6272b5 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton +Date: Mon, 29 Oct 2012 20:26:36 -0700 +Subject: [PATCH 06/12] Allow building a separate qmake for the target + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Paul Eggleton +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + qmake/qmake.pro | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/qmake/qmake.pro b/qmake/qmake.pro +index 0d92ac2..9be0e9b 100644 +--- a/qmake/qmake.pro ++++ b/qmake/qmake.pro +@@ -9,6 +9,7 @@ CONFIG -= qt shared app_bundle uic + DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \ + PROEVALUATOR_FULL PROEVALUATOR_DEBUG + DESTDIR = ../bin/ ++TARGET = qmake + + OBJECTS_DIR = . + MOC_DIR = . +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-5.0.2/0006-qt_functions-temporary-remove-isEmpty-check.patch deleted file mode 100644 index ff5bc0c1..00000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0006-qt_functions-temporary-remove-isEmpty-check.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 753924949e1d72c63283ecc904e2134fa76888d7 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 06/11] qt_functions: temporary remove isEmpty check - -* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value - -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_functions.prf | 6 +++++- - mkspecs/features/qt_tool.prf | 2 +- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 876f657..0e094a8 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.command) - isEmpty($$1) { - $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 -- isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+ # for some reason isEmpty does not work here, FIXME before submitting upstream -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch -+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { - $$1 = $$[QT_HOST_BINS]/$$2 - } - contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { -diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index 8a636c7..0dad97c 100644 ---- a/mkspecs/features/qt_tool.prf -+++ b/mkspecs/features/qt_tool.prf -@@ -31,7 +31,7 @@ load(qt_targets) - - # If we are doing a prefix build, create a "module" pri which enables - # qtPrepareTool() to work with the non-installed build. --!build_pass:force_independent:isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+!build_pass:force_independent:!exists($$[QT_EXTERNAL_HOST_BINS]) { - - isEmpty(MODULE):MODULE = $$TARGET - --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch new file mode 100644 index 00000000..3cfe8c3b --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -0,0 +1,31 @@ +From a1d0c7fb8fd689af7d3616ecf5d6aaf5ffd84bc9 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 22:33:33 +0200 +Subject: [PATCH 07/12] configureapp: Prefix default LIBDIRS and INCDIRS with + SYSROOT + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + tools/configure/configureapp.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp +index cfc6f97..d0e17fa 100644 +--- a/tools/configure/configureapp.cpp ++++ b/tools/configure/configureapp.cpp +@@ -3087,8 +3087,8 @@ void Configure::generateQConfigPri() + configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; + if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { + // FIXME: add detection +- configStream << "QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl; +- configStream << "QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl; ++ configStream << "QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl; ++ configStream << "QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl; + } + if (dictionary["QT_EDITION"].contains("OPENSOURCE")) + configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-5.0.2/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch deleted file mode 100644 index c7c418fd..00000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c6909ce9ed3e65833ae835d89b346fbb158a1127 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 08/11] configureapp: Prefix default LIBDIRS and INCDIRS with - SYSROOT - -Change-Id: I275b30f67bc477d8e9a008f4894198859ec45017 -Signed-off-by: Martin Jansa ---- - tools/configure/configureapp.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index cfc6f97..d0e17fa 100644 ---- a/tools/configure/configureapp.cpp -+++ b/tools/configure/configureapp.cpp -@@ -3087,8 +3087,8 @@ void Configure::generateQConfigPri() - configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; - if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { - // FIXME: add detection -- configStream << "QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl; -- configStream << "QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl; -+ configStream << "QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl; -+ configStream << "QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl; - } - if (dictionary["QT_EDITION"].contains("OPENSOURCE")) - configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; --- -1.8.2.1 - 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 @@ +From 8a97079c1b17f27256a4a816e5cc85344c29ac6f Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 23:15:37 +0200 +Subject: [PATCH 08/12] qt_module: Fix pkgconfig replacement + +* in situation like this: + QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm + QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib + QT_INSTALL_LIBS/raw:/usr/lib + QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib + + I don't want the replacement like this: + sed + -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g" + -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g" + "../../lib/pkgconfig/Qt5Core.pc" + >"/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" + because that way I'll end with -L/usr/lib in .pc file which is + cross-compile unfriendly, keeping ${libdir}/${includedir} works better + in my case + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_module.prf | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 1132943..7fbfd8d 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -128,18 +128,30 @@ unix|win32-g++* { + rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* + else: \ + rplbase = $$MODULE_BASE_OUTDIR ++ pkgconfig_include_replace.match = $$rplbase/include ++ pkgconfig_include_replace.replace = "\$$\\{includedir}" ++ pkgconfig_lib_replace.match = $$rplbase/lib ++ pkgconfig_lib_replace.replace = "\$$\\{libdir}" + include_replace.match = $$rplbase/include + include_replace.replace = $$[QT_INSTALL_HEADERS/raw] + lib_replace.match = $$rplbase/lib + lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" ++ ++ !isEmpty(SYSROOT): \ ++ rplbase = $$[SYSROOT] \ ++ lafile_replace.match = $$rplbase \ ++ lafile_replace.replace = "=" \ ++ ++ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace + QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace + } + + unix { + CONFIG += create_libtool explicitlib + QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] +- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace ++ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace + } + + unix|win32-g++* { +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch new file mode 100644 index 00000000..13112c44 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-paths-in-.prl-files.patch @@ -0,0 +1,62 @@ +From a70d48880e27586efe5f6aa195385207abf3cead Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 28 Apr 2013 12:56:55 +0200 +Subject: [PATCH 09/12] qt_module: Fix paths in .prl files + +* 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 +* 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 + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- + 1 file changed, 17 insertions(+), 11 deletions(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 7fbfd8d..226119f 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -132,17 +132,23 @@ unix|win32-g++* { + pkgconfig_include_replace.replace = "\$$\\{includedir}" + pkgconfig_lib_replace.match = $$rplbase/lib + pkgconfig_lib_replace.replace = "\$$\\{libdir}" +- include_replace.match = $$rplbase/include +- include_replace.replace = $$[QT_INSTALL_HEADERS/raw] +- lib_replace.match = $$rplbase/lib +- lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +- lafile_replace.match = $$rplbase +- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" +- +- !isEmpty(SYSROOT): \ +- rplbase = $$[SYSROOT] \ +- lafile_replace.match = $$rplbase \ +- lafile_replace.replace = "=" \ ++ !exists($$[QT_SYSROOT]) { ++ include_replace.match = $$rplbase/include ++ include_replace.replace = $$[QT_INSTALL_HEADERS/raw] ++ lib_replace.match = $$rplbase/lib ++ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]" ++ } else { ++ # include_replace and lib_replace are duplicate, but we don't want to ++ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional ++ include_replace.match = $$rplbase ++ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] ++ lib_replace.match = $$rplbase ++ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" ++ } + + QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace + QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-pkgconfig-replacement.patch deleted file mode 100644 index a9f66b7c..00000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0009-qt_module-Fix-pkgconfig-replacement.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 0bd37923dec93270066fc4362db7e443475a4b06 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 09/11] qt_module: Fix pkgconfig replacement - -* in situation like this: - QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm - QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib - QT_INSTALL_LIBS/raw:/usr/lib - QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib - - I don't want the replacement like this: - sed - -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g" - -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g" - "../../lib/pkgconfig/Qt5Core.pc" - >"/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" - because that way I'll end with -L/usr/lib in .pc file which is - cross-compile unfriendly, keeping ${libdir}/${includedir} works better - in my case - -Change-Id: Id0f9143c012b7fe7bb7bab0055687f4e0517f653 -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_module.prf | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 1132943..7fbfd8d 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -128,18 +128,30 @@ unix|win32-g++* { - rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* - else: \ - rplbase = $$MODULE_BASE_OUTDIR -+ pkgconfig_include_replace.match = $$rplbase/include -+ pkgconfig_include_replace.replace = "\$$\\{includedir}" -+ pkgconfig_lib_replace.match = $$rplbase/lib -+ pkgconfig_lib_replace.replace = "\$$\\{libdir}" - include_replace.match = $$rplbase/include - include_replace.replace = $$[QT_INSTALL_HEADERS/raw] - lib_replace.match = $$rplbase/lib - lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -+ -+ !isEmpty(SYSROOT): \ -+ rplbase = $$[SYSROOT] \ -+ lafile_replace.match = $$rplbase \ -+ lafile_replace.replace = "=" \ -+ -+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace - QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace - } - - unix { - CONFIG += create_libtool explicitlib - QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] -- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace -+ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace - } - - unix|win32-g++* { --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch b/recipes-qt/qt5/qtbase-5.0.2/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch deleted file mode 100644 index d5a31acf..00000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 10dde2fe0b7d8fe9ca7b4aa21d351b5dc01341c0 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 22:51:54 +0200 -Subject: [PATCH 10/11] qmake/property: rename QT_INSTALL_CONFIGURATION to - QT_INSTALL_SETTINGS - -* this variable is referenced from configure and configureapp.cpp as QT_INSTALL_SETTINGS - property.cpp was only place using name QT_INSTALL_CONFIGURATION - -Upstream-Status: Submitted -https://codereview.qt-project.org/54912 - -Change-Id: I0f3c3b5c0527d22c0171674710cdbb32f10e990f -Signed-off-by: Martin Jansa ---- - qmake/property.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qmake/property.cpp b/qmake/property.cpp -index c1b7a9f..af2eacf 100644 ---- a/qmake/property.cpp -+++ b/qmake/property.cpp -@@ -68,7 +68,7 @@ static const struct { - { "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath, false }, - { "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false }, - { "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false }, -- { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false }, -+ { "QT_INSTALL_SETTINGS", QLibraryInfo::SettingsPath, false }, - { "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath, false }, - { "QT_INSTALL_DEMOS", QLibraryInfo::ExamplesPath, false }, // Just backwards compat - { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true }, --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch new file mode 100644 index 00000000..cac2bfed --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0010-wayland-scanner-disable-silent-rules.patch @@ -0,0 +1,46 @@ +From 505bbe468956de2fdf2f27e8905582fe438d3b35 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 5 May 2013 11:18:34 +0200 +Subject: [PATCH 10/12] wayland-scanner: disable silent rules + +* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/wayland-scanner.prf | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf +index 90e1e0f..0750849 100644 +--- a/mkspecs/features/wayland-scanner.prf ++++ b/mkspecs/features/wayland-scanner.prf +@@ -10,7 +10,7 @@ wayland-server-header.variable_out = HEADERS + wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} + wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} + +-silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands ++#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands + QMAKE_EXTRA_COMPILERS += wayland-server-header + + wayland-client-header.name = wayland ${QMAKE_FILE_BASE} +@@ -19,7 +19,7 @@ wayland-client-header.variable_out = HEADERS + wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} + wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} + +-silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands ++#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands + QMAKE_EXTRA_COMPILERS += wayland-client-header + + wayland-code.name = wayland ${QMAKE_FILE_BASE} +@@ -28,5 +28,5 @@ wayland-code.variable_out = SOURCES + wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c + wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} + +-silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands ++#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands + QMAKE_EXTRA_COMPILERS += wayland-code +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch new file mode 100644 index 00000000..9436e398 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -0,0 +1,44 @@ +From a2439736a0efb80aea1746b0aada551ff63ad7e6 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 8 May 2013 23:54:35 +0200 +Subject: [PATCH 11/12] configure: don't export SYSTEM_VARIABLES to .qmake.vars + +* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is + causing issues as we need g++ to be used as linker + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + configure | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/configure b/configure +index 546bed2..34074ee 100755 +--- a/configure ++++ b/configure +@@ -740,20 +740,7 @@ fi'` + done + + SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" +-for varname in $SYSTEM_VARIABLES; do +- qmakevarname="${varname}" +- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS +- if [ "${varname}" = "LDFLAGS" ]; then +- qmakevarname="LFLAGS" +- elif [ "${varname}" = "LD" ]; then +- qmakevarname="LINK" +- fi +- cmd=`echo \ +-'if [ -n "\$'${varname}'" ]; then +- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" +-fi'` +- eval "$cmd" +-done ++ + # Use CC/CXX to run config.tests + mkdir -p "$outpath/config.tests" + rm -f "$outpath/config.tests/.qmake.cache" +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0011-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-5.0.2/0011-qt_module-Fix-paths-in-.prl-files.patch deleted file mode 100644 index 19523084..00000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0011-qt_module-Fix-paths-in-.prl-files.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 851960243212ffe0ac25d0fea236b7a8bc0e5dc5 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 28 Apr 2013 12:56:55 +0200 -Subject: [PATCH 11/11] qt_module: Fix paths in .prl files - -* 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 -* 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 - -Change-Id: I4b66dcad539a3ba876d8e4ee2eb2ccd626cd03ea -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- - 1 file changed, 17 insertions(+), 11 deletions(-) - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 7fbfd8d..226119f 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -132,17 +132,23 @@ unix|win32-g++* { - pkgconfig_include_replace.replace = "\$$\\{includedir}" - pkgconfig_lib_replace.match = $$rplbase/lib - pkgconfig_lib_replace.replace = "\$$\\{libdir}" -- include_replace.match = $$rplbase/include -- include_replace.replace = $$[QT_INSTALL_HEADERS/raw] -- lib_replace.match = $$rplbase/lib -- lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -- lafile_replace.match = $$rplbase -- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -- -- !isEmpty(SYSROOT): \ -- rplbase = $$[SYSROOT] \ -- lafile_replace.match = $$rplbase \ -- lafile_replace.replace = "=" \ -+ !exists($$[QT_SYSROOT]) { -+ include_replace.match = $$rplbase/include -+ include_replace.replace = $$[QT_INSTALL_HEADERS/raw] -+ lib_replace.match = $$rplbase/lib -+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]" -+ } else { -+ # include_replace and lib_replace are duplicate, but we don't want to -+ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional -+ include_replace.match = $$rplbase -+ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] -+ lib_replace.match = $$rplbase -+ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -+ } - - QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace - QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch new file mode 100644 index 00000000..fe891df0 --- /dev/null +++ b/recipes-qt/qt5/qtbase-5.0.2/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -0,0 +1,37 @@ +From dd7756dd5a3c3eb677c3bacce257c1c8bbf03098 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Thu, 9 May 2013 10:06:50 +0200 +Subject: [PATCH 12/12] configure.prf: Allow to add extra arguments to make + +* sometimes we would like to add -e or define some variable and respect it from both + Makefiles used in configure tests and also Makefiles to build the application + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/configure.prf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf +index 39144e7..de48b07 100644 +--- a/mkspecs/features/configure.prf ++++ b/mkspecs/features/configure.prf +@@ -54,12 +54,12 @@ defineTest(qtCompileTest) { + qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" + + # Clean up after previous run +- exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean") ++ exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean") + + mkpath($$test_out_dir)|error("Aborting.") + + qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") { +- qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") { ++ qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") { + log("yes$$escape_expand(\\n)") + msg = "test $$1 succeeded" + write_file($$QMAKE_CONFIG_LOG, msg, append) +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-5.0.2/0012-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-5.0.2/0012-wayland-scanner-disable-silent-rules.patch deleted file mode 100644 index 1d2d35e5..00000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0012-wayland-scanner-disable-silent-rules.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a74a1b5bc86553863b8dcbea7a7fde5642e73115 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 5 May 2013 11:18:34 +0200 -Subject: [PATCH 12/12] wayland-scanner: disable silent rules - -* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands - -Change-Id: I1ffb04c01311f08984bc2a8c1cc92cb963d3e147 -Signed-off-by: Martin Jansa ---- - mkspecs/features/wayland-scanner.prf | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf -index 90e1e0f..0750849 100644 ---- a/mkspecs/features/wayland-scanner.prf -+++ b/mkspecs/features/wayland-scanner.prf -@@ -10,7 +10,7 @@ wayland-server-header.variable_out = HEADERS - wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} - wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} - --silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands -+#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands - QMAKE_EXTRA_COMPILERS += wayland-server-header - - wayland-client-header.name = wayland ${QMAKE_FILE_BASE} -@@ -19,7 +19,7 @@ wayland-client-header.variable_out = HEADERS - wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} - wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} - --silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands -+#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands - QMAKE_EXTRA_COMPILERS += wayland-client-header - - wayland-code.name = wayland ${QMAKE_FILE_BASE} -@@ -28,5 +28,5 @@ wayland-code.variable_out = SOURCES - wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c - wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} - --silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands -+#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands - QMAKE_EXTRA_COMPILERS += wayland-code --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-5.0.2/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch deleted file mode 100644 index 9dce1a02..00000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a81111b76b2890b51d645ee25267a4e6a2eaed1f Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 8 May 2013 23:54:35 +0200 -Subject: [PATCH 13/13] configure: don't export SYSTEM_VARIABLES to .qmake.vars - -* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is - causing issues as we need g++ to be used as linker - -Change-Id: I22e32aabd502df9f84cebb82f17bec4099363c8e -Signed-off-by: Martin Jansa ---- - configure | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/configure b/configure -index d4131dc..fcd8ecc 100755 ---- a/configure -+++ b/configure -@@ -740,20 +740,7 @@ fi'` - done - - SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" --for varname in $SYSTEM_VARIABLES; do -- qmakevarname="${varname}" -- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS -- if [ "${varname}" = "LDFLAGS" ]; then -- qmakevarname="LFLAGS" -- elif [ "${varname}" = "LD" ]; then -- qmakevarname="LINK" -- fi -- cmd=`echo \ --'if [ -n "\$'${varname}'" ]; then -- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" --fi'` -- eval "$cmd" --done -+ - # Use CC/CXX to run config.tests - mkdir -p "$outpath/config.tests" - rm -f "$outpath/config.tests/.qmake.cache" --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-5.0.2/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-5.0.2/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch deleted file mode 100644 index e432b979..00000000 --- a/recipes-qt/qt5/qtbase-5.0.2/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 68c459603bcf545637e852e08613c6fca4da9ef9 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Thu, 9 May 2013 10:06:50 +0200 -Subject: [PATCH 14/14] configure.prf: Allow to add extra arguments to make - -* sometimes we would like to add -e or define some variable and respect it from both - Makefiles used in configure tests and also Maakefiles to build the application - -Change-Id: Ib29beb89cc9b179dddd40d3b212b7c200d29a469 ---- - mkspecs/features/configure.prf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index 39144e7..1864ba8 100644 ---- a/mkspecs/features/configure.prf -+++ b/mkspecs/features/configure.prf -@@ -54,12 +54,12 @@ defineTest(qtCompileTest) { - qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" - - # Clean up after previous run -- exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean") -+ exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean") - - mkpath($$test_out_dir)|error("Aborting.") - - qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") { -- qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") { -+ qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") { - log("yes$$escape_expand(\\n)") - msg = "test $$1 succeeded" - write_file($$QMAKE_CONFIG_LOG, msg, append) --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch index 1f328977..f55d474a 100644 --- a/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase-git/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From 853b6920e9f10a29c5619b4239e960ad33080e8e Mon Sep 17 00:00:00 2001 +From e45d617fd823f683ed426d09fd8b6edefb9517ab Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH 01/12] Add linux-oe-g++ platform @@ -31,7 +31,6 @@ Subject: [PATCH 01/12] Add linux-oe-g++ platform Upstream-Status: Pending -Change-Id: Ie1eb097efe289179b86d5d11740274114e50639d Signed-off-by: Martin Jansa --- configure | 54 ++++++++++++++++--- diff --git a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index dfb6ae93..0725347a 100644 --- a/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase-git/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,7 +1,7 @@ -From e4636d4d18246278fb504cff3e16321c98d1f99d Mon Sep 17 00:00:00 2001 +From 4da4d9606efc8d3109296906e5b13814499ae698 Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/14] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside using the environment Allow to set a qt.conf from the outside using the environment. This allows @@ -10,7 +10,6 @@ the same qmake binary to build qt/x11 and qt/embedded Upstream-Status: Pending -Change-Id: I0a53b713574e1860189fa52b44251eb4d19eeddc Signed-off-by: Martin Jansa --- src/corelib/global/qlibraryinfo.cpp | 5 ++++- diff --git a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch index e1c56ac3..2a64291a 100644 --- a/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase-git/0003-Add-external-hostbindir-option.patch @@ -1,13 +1,15 @@ -From c244c6a89f6f70a2443748475f482cc97e3ac118 Mon Sep 17 00:00:00 2001 +From c9bf00e21ae398575adf4411e67b35cdf44920e5 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/11] Add -external-hostbindir option +Subject: [PATCH 03/12] Add -external-hostbindir option * when cross-compiling it's sometimes useful to use existing tools from machine (or in OpenEmbedded built with separate native recipe) when building for target * this way we can skip bootstraping tools we already have +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- configure | 15 ++++++++++++++- @@ -156,10 +158,10 @@ index 4c41cff..997ea6d 100644 # If we are doing a prefix build, create a "module" pri which enables diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index acd11f5..bba0861 100644 +index 6b40731..139a60f 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -272,7 +272,7 @@ QLibraryInfo::isDebugBuild() +@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild() */ static const struct { @@ -168,7 +170,7 @@ index acd11f5..bba0861 100644 } qtConfEntries[] = { { "Prefix", "." }, { "Documentation", "doc" }, // should be ${Data}/doc -@@ -297,6 +297,7 @@ static const struct { +@@ -295,6 +295,7 @@ static const struct { { "HostPrefix", "" }, { "HostBinaries", "bin" }, { "HostData", "." }, diff --git a/recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch deleted file mode 100644 index 285c8a46..00000000 --- a/recipes-qt/qt5/qtbase-git/0004-qmake-is-already-built-in-qtbase-native.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d0f322cf4ee9ead48997bb3e3a2c137bba91141b Mon Sep 17 00:00:00 2001 -From: Michael Krelin -Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 04/11] qmake is already built in qtbase-native - -Ported from OE by: Yu Ke -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 65f4d26..dbf99a9 100755 ---- a/configure -+++ b/configure -@@ -3938,7 +3938,7 @@ setBootstrapEvalVariable() - - - # build qmake --if true; then ###[ '!' -f "$outpath/bin/qmake" ]; -+if false; then ###[ '!' -f "$outpath/bin/qmake" ]; - echo "Creating qmake..." - - mkdir -p "$outpath/qmake" || exit --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch new file mode 100644 index 00000000..6e694544 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0004-qt_functions-temporary-remove-isEmpty-check.patch @@ -0,0 +1,51 @@ +From e561978ab73e72d7b088c9927fb6a87d2eff6833 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 17 Apr 2013 18:06:25 +0200 +Subject: [PATCH 04/12] qt_functions: temporary remove isEmpty check + +* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value +* isEmpty works correctly only with qmake variables (e.g. $$FOO - + isEmpty(FOO)), but doesn't work with system properties like $$[FOO]. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_functions.prf | 6 +++++- + mkspecs/features/qt_tool.prf | 3 +-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index 876f657..0e094a8 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) { + $$1 = $$eval(QT_TOOL.$${2}.command) + isEmpty($$1) { + $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 +- isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ # for some reason isEmpty does not work here, FIXME before submitting upstream ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch ++ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { + $$1 = $$[QT_HOST_BINS]/$$2 + } + contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { +diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf +index c110ea5..34ee9ca 100644 +--- a/mkspecs/features/qt_tool.prf ++++ b/mkspecs/features/qt_tool.prf +@@ -15,8 +15,7 @@ CONFIG += console + + # If we are doing a prefix build, create a "module" pri which enables + # qtPrepareTool() to work with the non-installed build. +-# Non-bootstrapped tools always need this because of the environment setup. +-!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) { + isEmpty(MODULE):MODULE = $$TARGET + + MODULE_DEPENDS = $$replace(QT, -private$, ) +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch deleted file mode 100644 index b239fd5b..00000000 --- a/recipes-qt/qt5/qtbase-git/0005-Allow-building-a-separate-qmake-for-the-target.patch +++ /dev/null @@ -1,29 +0,0 @@ -From a6a15ff0150ca685909782f0ca861fa4336f33b3 Mon Sep 17 00:00:00 2001 -From: Paul Eggleton -Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 05/11] Allow building a separate qmake for the target - -Upstream-Status: Inappropriate [config] - -Signed-off-by: Paul Eggleton -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - qmake/qmake.pro | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/qmake/qmake.pro b/qmake/qmake.pro -index 0d92ac2..9be0e9b 100644 ---- a/qmake/qmake.pro -+++ b/qmake/qmake.pro -@@ -9,6 +9,7 @@ CONFIG -= qt shared app_bundle uic - DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \ - PROEVALUATOR_FULL PROEVALUATOR_DEBUG - DESTDIR = ../bin/ -+TARGET = qmake - - OBJECTS_DIR = . - MOC_DIR = . --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch new file mode 100644 index 00000000..febefb8a --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0005-qmake-is-already-built-in-qtbase-native.patch @@ -0,0 +1,30 @@ +From f42c4156c3e056e9fd2d6b0542662d705efb2722 Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Mon, 29 Oct 2012 20:07:49 -0700 +Subject: [PATCH 05/12] qmake is already built in qtbase-native + +Ported from OE by: Yu Ke +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 65f4d26..dbf99a9 100755 +--- a/configure ++++ b/configure +@@ -3938,7 +3938,7 @@ setBootstrapEvalVariable() + + + # build qmake +-if true; then ###[ '!' -f "$outpath/bin/qmake" ]; ++if false; then ###[ '!' -f "$outpath/bin/qmake" ]; + echo "Creating qmake..." + + mkdir -p "$outpath/qmake" || exit +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch new file mode 100644 index 00000000..4d04c7ce --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0006-Allow-building-a-separate-qmake-for-the-target.patch @@ -0,0 +1,29 @@ +From 8be64919365240728dcce02fac44e5018aaec191 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton +Date: Mon, 29 Oct 2012 20:26:36 -0700 +Subject: [PATCH 06/12] Allow building a separate qmake for the target + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Paul Eggleton +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + qmake/qmake.pro | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/qmake/qmake.pro b/qmake/qmake.pro +index 0d92ac2..9be0e9b 100644 +--- a/qmake/qmake.pro ++++ b/qmake/qmake.pro +@@ -9,6 +9,7 @@ CONFIG -= qt shared app_bundle uic + DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \ + PROEVALUATOR_FULL PROEVALUATOR_DEBUG + DESTDIR = ../bin/ ++TARGET = qmake + + OBJECTS_DIR = . + MOC_DIR = . +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch deleted file mode 100644 index a2b1e5e8..00000000 --- a/recipes-qt/qt5/qtbase-git/0006-qt_functions-temporary-remove-isEmpty-check.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e356895802c2a1e596882c79161994ebbf361d65 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 06/11] qt_functions: temporary remove isEmpty check - -* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value - -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_functions.prf | 6 +++++- - mkspecs/features/qt_tool.prf | 3 +-- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 876f657..0e094a8 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -194,7 +194,11 @@ defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.command) - isEmpty($$1) { - $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 -- isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+ # for some reason isEmpty does not work here, FIXME before submitting upstream -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch -+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { - $$1 = $$[QT_HOST_BINS]/$$2 - } - contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { -diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index c110ea5..34ee9ca 100644 ---- a/mkspecs/features/qt_tool.prf -+++ b/mkspecs/features/qt_tool.prf -@@ -15,8 +15,7 @@ CONFIG += console - - # If we are doing a prefix build, create a "module" pri which enables - # qtPrepareTool() to work with the non-installed build. --# Non-bootstrapped tools always need this because of the environment setup. --!build_pass:if(!host_build|!force_bootstrap|force_independent):isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+!build_pass:if(!host_build|!force_bootstrap|force_independent):!exists($$[QT_EXTERNAL_HOST_BINS]) { - isEmpty(MODULE):MODULE = $$TARGET - - MODULE_DEPENDS = $$replace(QT, -private$, ) --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch new file mode 100644 index 00000000..a1129f79 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -0,0 +1,29 @@ +From 98d14c01a92c5caad2bb0e0b4a097ae11d83b58e Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 22:33:33 +0200 +Subject: [PATCH 07/12] configureapp: Prefix default LIBDIRS and INCDIRS with + SYSROOT + +Upstream-Status: Pending +--- + tools/configure/configureapp.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp +index 57409b1..f443007 100644 +--- a/tools/configure/configureapp.cpp ++++ b/tools/configure/configureapp.cpp +@@ -3172,8 +3172,8 @@ void Configure::generateQConfigPri() + configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; + if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { + // FIXME: add detection +- configStream << "QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl; +- configStream << "QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl; ++ configStream << "QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl; ++ configStream << "QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl; + } + if (dictionary["QT_EDITION"].contains("OPENSOURCE")) + configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase-git/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch deleted file mode 100644 index 90d6f75a..00000000 --- a/recipes-qt/qt5/qtbase-git/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6c494ea0e73c9ef60f45e7fdc0de40bb51ad5ac6 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 08/11] configureapp: Prefix default LIBDIRS and INCDIRS with - SYSROOT - -Change-Id: I464c25888ab8b99ced6bd669b5c6448d491725a8 ---- - tools/configure/configureapp.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index 57409b1..f443007 100644 ---- a/tools/configure/configureapp.cpp -+++ b/tools/configure/configureapp.cpp -@@ -3172,8 +3172,8 @@ void Configure::generateQConfigPri() - configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; - if (dictionary.contains("XQMAKESPEC") && !dictionary["XQMAKESPEC"].startsWith("wince")) { - // FIXME: add detection -- configStream << "QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl; -- configStream << "QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl; -+ configStream << "QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl; -+ configStream << "QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl; - } - if (dictionary["QT_EDITION"].contains("OPENSOURCE")) - configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; --- -1.8.2.1 - 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 new file mode 100644 index 00000000..1b3c185f --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0008-qt_module-Fix-pkgconfig-replacement.patch @@ -0,0 +1,68 @@ +From 1ac376893b75c36cc1ee6465e814546e2215354e Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 23:15:37 +0200 +Subject: [PATCH 08/12] qt_module: Fix pkgconfig replacement + +* in situation like this: + QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm + QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib + QT_INSTALL_LIBS/raw:/usr/lib + QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib + + I don't want the replacement like this: + sed + -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g" + -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g" + "../../lib/pkgconfig/Qt5Core.pc" + >"/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" + because that way I'll end with -L/usr/lib in .pc file which is + cross-compile unfriendly, keeping ${libdir}/${includedir} works better + in my case + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_module.prf | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 3531d28..1c43972 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -136,18 +136,30 @@ unix|win32-g++* { + rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* + else: \ + rplbase = $$MODULE_BASE_OUTDIR ++ pkgconfig_include_replace.match = $$rplbase/include ++ pkgconfig_include_replace.replace = "\$$\\{includedir}" ++ pkgconfig_lib_replace.match = $$rplbase/lib ++ pkgconfig_lib_replace.replace = "\$$\\{libdir}" + include_replace.match = $$rplbase/include + include_replace.replace = $$[QT_INSTALL_HEADERS/raw] + lib_replace.match = $$rplbase/lib + lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" ++ ++ !isEmpty(SYSROOT): \ ++ rplbase = $$[SYSROOT] \ ++ lafile_replace.match = $$rplbase \ ++ lafile_replace.replace = "=" \ ++ ++ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace + QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace + } + + unix { + CONFIG += create_libtool explicitlib + QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] +- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace ++ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace + } + + unix|win32-g++* { +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch new file mode 100644 index 00000000..1d68efc9 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-paths-in-.prl-files.patch @@ -0,0 +1,62 @@ +From 111583f7a46871d130ac1c6688972ebf98452af4 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 28 Apr 2013 12:56:55 +0200 +Subject: [PATCH 09/12] qt_module: Fix paths in .prl files + +* 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 +* 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 + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- + 1 file changed, 17 insertions(+), 11 deletions(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 1c43972..feec2d5 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -140,17 +140,23 @@ unix|win32-g++* { + pkgconfig_include_replace.replace = "\$$\\{includedir}" + pkgconfig_lib_replace.match = $$rplbase/lib + pkgconfig_lib_replace.replace = "\$$\\{libdir}" +- include_replace.match = $$rplbase/include +- include_replace.replace = $$[QT_INSTALL_HEADERS/raw] +- lib_replace.match = $$rplbase/lib +- lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +- lafile_replace.match = $$rplbase +- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" +- +- !isEmpty(SYSROOT): \ +- rplbase = $$[SYSROOT] \ +- lafile_replace.match = $$rplbase \ +- lafile_replace.replace = "=" \ ++ !exists($$[QT_SYSROOT]) { ++ include_replace.match = $$rplbase/include ++ include_replace.replace = $$[QT_INSTALL_HEADERS/raw] ++ lib_replace.match = $$rplbase/lib ++ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]" ++ } else { ++ # include_replace and lib_replace are duplicate, but we don't want to ++ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional ++ include_replace.match = $$rplbase ++ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] ++ lib_replace.match = $$rplbase ++ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" ++ } + + QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace + QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-pkgconfig-replacement.patch deleted file mode 100644 index 67769b33..00000000 --- a/recipes-qt/qt5/qtbase-git/0009-qt_module-Fix-pkgconfig-replacement.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 72f1087fef0e506b9ab015498f5c7a4b3161c6f3 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 09/11] qt_module: Fix pkgconfig replacement - -* in situation like this: - QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm - QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib - QT_INSTALL_LIBS/raw:/usr/lib - QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib - - I don't want the replacement like this: - sed - -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g" - -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g" - "../../lib/pkgconfig/Qt5Core.pc" - >"/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" - because that way I'll end with -L/usr/lib in .pc file which is - cross-compile unfriendly, keeping ${libdir}/${includedir} works better - in my case - -Change-Id: Id0f9143c012b7fe7bb7bab0055687f4e0517f653 -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_module.prf | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 3531d28..1c43972 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -136,18 +136,30 @@ unix|win32-g++* { - rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* - else: \ - rplbase = $$MODULE_BASE_OUTDIR -+ pkgconfig_include_replace.match = $$rplbase/include -+ pkgconfig_include_replace.replace = "\$$\\{includedir}" -+ pkgconfig_lib_replace.match = $$rplbase/lib -+ pkgconfig_lib_replace.replace = "\$$\\{libdir}" - include_replace.match = $$rplbase/include - include_replace.replace = $$[QT_INSTALL_HEADERS/raw] - lib_replace.match = $$rplbase/lib - lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -+ -+ !isEmpty(SYSROOT): \ -+ rplbase = $$[SYSROOT] \ -+ lafile_replace.match = $$rplbase \ -+ lafile_replace.replace = "=" \ -+ -+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace - QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace - } - - unix { - CONFIG += create_libtool explicitlib - QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] -- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace -+ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace - } - - unix|win32-g++* { --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch b/recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch deleted file mode 100644 index 4fa772cd..00000000 --- a/recipes-qt/qt5/qtbase-git/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6d816874a95cb85bdf96e06f763e21c098d92b89 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 22:51:54 +0200 -Subject: [PATCH 10/11] qmake/property: rename QT_INSTALL_CONFIGURATION to - QT_INSTALL_SETTINGS - -* this variable is referenced from configure and configureapp.cpp as QT_INSTALL_SETTINGS - property.cpp was only place using name QT_INSTALL_CONFIGURATION - -Upstream-Status: Submitted -https://codereview.qt-project.org/54912 - -Change-Id: I3ba40d5f8773fe9aea728c5b2418aa55cecc92da ---- - qmake/property.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qmake/property.cpp b/qmake/property.cpp -index c1b7a9f..af2eacf 100644 ---- a/qmake/property.cpp -+++ b/qmake/property.cpp -@@ -68,7 +68,7 @@ static const struct { - { "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath, false }, - { "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false }, - { "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false }, -- { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false }, -+ { "QT_INSTALL_SETTINGS", QLibraryInfo::SettingsPath, false }, - { "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath, false }, - { "QT_INSTALL_DEMOS", QLibraryInfo::ExamplesPath, false }, // Just backwards compat - { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true }, --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch new file mode 100644 index 00000000..cac9bef4 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0010-wayland-scanner-disable-silent-rules.patch @@ -0,0 +1,82 @@ +From 1224e23a7990ac877265a2736827a98c300a8bf7 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 5 May 2013 11:18:34 +0200 +Subject: [PATCH 10/12] wayland-scanner: disable silent rules + +* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/wayland-scanner.prf | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf +index 2ec064f..847d0f7 100644 +--- a/mkspecs/features/wayland-scanner.prf ++++ b/mkspecs/features/wayland-scanner.prf +@@ -10,7 +10,7 @@ wayland-server-header.input = WAYLANDSERVERSOURCES + wayland-server-header.variable_out = HEADERS + wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} + wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands ++#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands + QMAKE_EXTRA_COMPILERS += wayland-server-header + + wayland-client-header.name = wayland ${QMAKE_FILE_BASE} +@@ -18,7 +18,7 @@ wayland-client-header.input = WAYLANDCLIENTSOURCES + wayland-client-header.variable_out = HEADERS + wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} + wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands ++#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands + QMAKE_EXTRA_COMPILERS += wayland-client-header + + wayland-code.name = wayland ${QMAKE_FILE_BASE} +@@ -26,7 +26,7 @@ wayland-code.input = WAYLANDCLIENTSOURCES WAYLANDSERVERSOURCES + wayland-code.variable_out = SOURCES + wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c + wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands ++#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands + QMAKE_EXTRA_COMPILERS += wayland-code + + qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner) +@@ -37,7 +37,7 @@ qtwayland-client-header.variable_out = HEADERS + qtwayland-client-header.depends = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} + qtwayland-client-header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} + qtwayland-client-header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands ++#silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands + QMAKE_EXTRA_COMPILERS += qtwayland-client-header + + qtwayland-client-code.name = qtwayland ${QMAKE_FILE_BASE} +@@ -46,7 +46,7 @@ qtwayland-client-code.variable_out = SOURCES + qtwayland-client-code.depends = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} + qtwayland-client-code.output = qwayland-${QMAKE_FILE_BASE}.cpp + qtwayland-client-code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands ++#silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands + QMAKE_EXTRA_COMPILERS += qtwayland-client-code + + qtwayland-server-header.name = qtwayland ${QMAKE_FILE_BASE} +@@ -55,7 +55,7 @@ qtwayland-server-header.variable_out = HEADERS + qtwayland-server-header.depends = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} + qtwayland-server-header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} + qtwayland-server-header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands ++#silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands + QMAKE_EXTRA_COMPILERS += qtwayland-server-header + + qtwayland-server-code.name = qtwayland ${QMAKE_FILE_BASE} +@@ -64,5 +64,5 @@ qtwayland-server-code.variable_out = SOURCES + qtwayland-server-code.depends = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} + qtwayland-server-code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp + qtwayland-server-code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} +-silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands ++#silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands + QMAKE_EXTRA_COMPILERS += qtwayland-server-code +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch new file mode 100644 index 00000000..fda64981 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -0,0 +1,44 @@ +From 9ffc6dba623bb44e1787f4e4af13af03f9f7a0d2 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 8 May 2013 23:54:35 +0200 +Subject: [PATCH 11/12] configure: don't export SYSTEM_VARIABLES to .qmake.vars + +* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is + causing issues as we need g++ to be used as linker + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + configure | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/configure b/configure +index dbf99a9..9ca23a4 100755 +--- a/configure ++++ b/configure +@@ -840,20 +840,7 @@ fi'` + done + + SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" +-for varname in $SYSTEM_VARIABLES; do +- qmakevarname="${varname}" +- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS +- if [ "${varname}" = "LDFLAGS" ]; then +- qmakevarname="LFLAGS" +- elif [ "${varname}" = "LD" ]; then +- qmakevarname="LINK" +- fi +- cmd=`echo \ +-'if [ -n "\$'${varname}'" ]; then +- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" +-fi'` +- eval "$cmd" +-done ++ + # Use CC/CXX to run config.tests + mkdir -p "$outpath/config.tests" + rm -f "$outpath/config.tests/.qmake.cache" +-- +1.8.2.1 + 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 @@ -From 57da761a8e1995a20250c6600bc99937a7b203b4 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 28 Apr 2013 12:56:55 +0200 -Subject: [PATCH 11/11] qt_module: Fix paths in .prl files - -* 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 -* 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 - -Change-Id: I4b66dcad539a3ba876d8e4ee2eb2ccd626cd03ea -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- - 1 file changed, 17 insertions(+), 11 deletions(-) - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 1c43972..feec2d5 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -140,17 +140,23 @@ unix|win32-g++* { - pkgconfig_include_replace.replace = "\$$\\{includedir}" - pkgconfig_lib_replace.match = $$rplbase/lib - pkgconfig_lib_replace.replace = "\$$\\{libdir}" -- include_replace.match = $$rplbase/include -- include_replace.replace = $$[QT_INSTALL_HEADERS/raw] -- lib_replace.match = $$rplbase/lib -- lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -- lafile_replace.match = $$rplbase -- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -- -- !isEmpty(SYSROOT): \ -- rplbase = $$[SYSROOT] \ -- lafile_replace.match = $$rplbase \ -- lafile_replace.replace = "=" \ -+ !exists($$[QT_SYSROOT]) { -+ include_replace.match = $$rplbase/include -+ include_replace.replace = $$[QT_INSTALL_HEADERS/raw] -+ lib_replace.match = $$rplbase/lib -+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]" -+ } else { -+ # include_replace and lib_replace are duplicate, but we don't want to -+ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional -+ include_replace.match = $$rplbase -+ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] -+ lib_replace.match = $$rplbase -+ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -+ } - - QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace - QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch new file mode 100644 index 00000000..7bcfd7f7 --- /dev/null +++ b/recipes-qt/qt5/qtbase-git/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -0,0 +1,37 @@ +From 7389b5556de11258d3084ede10c12859353fb13b Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Thu, 9 May 2013 10:06:50 +0200 +Subject: [PATCH 12/12] configure.prf: Allow to add extra arguments to make + +* sometimes we would like to add -e or define some variable and respect it from both + Makefiles used in configure tests and also Makefiles to build the application + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/configure.prf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf +index b4569df..d189e50 100644 +--- a/mkspecs/features/configure.prf ++++ b/mkspecs/features/configure.prf +@@ -57,12 +57,12 @@ defineTest(qtCompileTest) { + qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" + + # Clean up after previous run +- exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean") ++ exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean") + + mkpath($$test_out_dir)|error("Aborting.") + + qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") { +- qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") { ++ qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") { + log("yes$$escape_expand(\\n)") + msg = "test $$1 succeeded" + write_file($$QMAKE_CONFIG_LOG, msg, append) +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase-git/0012-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase-git/0012-wayland-scanner-disable-silent-rules.patch deleted file mode 100644 index ca55e625..00000000 --- a/recipes-qt/qt5/qtbase-git/0012-wayland-scanner-disable-silent-rules.patch +++ /dev/null @@ -1,81 +0,0 @@ -From db28b82f5a0deb14f57dcfe5c2743ec6b844b9aa Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 5 May 2013 11:18:34 +0200 -Subject: [PATCH 12/12] wayland-scanner: disable silent rules - -* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands - -Change-Id: I1ffb04c01311f08984bc2a8c1cc92cb963d3e147 -Signed-off-by: Martin Jansa ---- - mkspecs/features/wayland-scanner.prf | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf -index 2ec064f..847d0f7 100644 ---- a/mkspecs/features/wayland-scanner.prf -+++ b/mkspecs/features/wayland-scanner.prf -@@ -10,7 +10,7 @@ wayland-server-header.input = WAYLANDSERVERSOURCES - wayland-server-header.variable_out = HEADERS - wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} - wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands -+#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands - QMAKE_EXTRA_COMPILERS += wayland-server-header - - wayland-client-header.name = wayland ${QMAKE_FILE_BASE} -@@ -18,7 +18,7 @@ wayland-client-header.input = WAYLANDCLIENTSOURCES - wayland-client-header.variable_out = HEADERS - wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} - wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands -+#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands - QMAKE_EXTRA_COMPILERS += wayland-client-header - - wayland-code.name = wayland ${QMAKE_FILE_BASE} -@@ -26,7 +26,7 @@ wayland-code.input = WAYLANDCLIENTSOURCES WAYLANDSERVERSOURCES - wayland-code.variable_out = SOURCES - wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c - wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands -+#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands - QMAKE_EXTRA_COMPILERS += wayland-code - - qtPrepareTool(QMAKE_QTWAYLANDSCANNER, qtwaylandscanner) -@@ -37,7 +37,7 @@ qtwayland-client-header.variable_out = HEADERS - qtwayland-client-header.depends = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} - qtwayland-client-header.output = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - qtwayland-client-header.commands = $$QMAKE_QTWAYLANDSCANNER client-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands -+#silent:qtwayland-client-header.commands = @echo QtWayland client header ${QMAKE_FILE_IN} && $$qtwayland-client-header.commands - QMAKE_EXTRA_COMPILERS += qtwayland-client-header - - qtwayland-client-code.name = qtwayland ${QMAKE_FILE_BASE} -@@ -46,7 +46,7 @@ qtwayland-client-code.variable_out = SOURCES - qtwayland-client-code.depends = qwayland-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - qtwayland-client-code.output = qwayland-${QMAKE_FILE_BASE}.cpp - qtwayland-client-code.commands = $$QMAKE_QTWAYLANDSCANNER client-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands -+#silent:qtwayland-client-code.commands = @echo QtWayland client code ${QMAKE_FILE_IN} && $$qtwayland-client-code.commands - QMAKE_EXTRA_COMPILERS += qtwayland-client-code - - qtwayland-server-header.name = qtwayland ${QMAKE_FILE_BASE} -@@ -55,7 +55,7 @@ qtwayland-server-header.variable_out = HEADERS - qtwayland-server-header.depends = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} - qtwayland-server-header.output = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - qtwayland-server-header.commands = $$QMAKE_QTWAYLANDSCANNER server-header ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands -+#silent:qtwayland-server-header.commands = @echo QtWayland server header ${QMAKE_FILE_IN} && $$qtwayland-server-header.commands - QMAKE_EXTRA_COMPILERS += qtwayland-server-header - - qtwayland-server-code.name = qtwayland ${QMAKE_FILE_BASE} -@@ -64,5 +64,5 @@ qtwayland-server-code.variable_out = SOURCES - qtwayland-server-code.depends = qwayland-server-${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - qtwayland-server-code.output = qwayland-server-${QMAKE_FILE_BASE}.cpp - qtwayland-server-code.commands = $$QMAKE_QTWAYLANDSCANNER server-code ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} --silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands -+#silent:qtwayland-server-code.commands = @echo QtWayland server code ${QMAKE_FILE_IN} && $$qtwayland-server-code.commands - QMAKE_EXTRA_COMPILERS += qtwayland-server-code --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-git/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase-git/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch deleted file mode 100644 index 606b0a6d..00000000 --- a/recipes-qt/qt5/qtbase-git/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ /dev/null @@ -1,43 +0,0 @@ -From afb5a8d45bd7c816eed959c08b05bbcd86814503 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 8 May 2013 23:54:35 +0200 -Subject: [PATCH 13/13] configure: don't export SYSTEM_VARIABLES to .qmake.vars - -* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is - causing issues as we need g++ to be used as linker - -Change-Id: I22e32aabd502df9f84cebb82f17bec4099363c8e -Signed-off-by: Martin Jansa ---- - configure | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/configure b/configure -index 866e535..620ffd6 100755 ---- a/configure -+++ b/configure -@@ -840,20 +840,7 @@ fi'` - done - - SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" --for varname in $SYSTEM_VARIABLES; do -- qmakevarname="${varname}" -- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS -- if [ "${varname}" = "LDFLAGS" ]; then -- qmakevarname="LFLAGS" -- elif [ "${varname}" = "LD" ]; then -- qmakevarname="LINK" -- fi -- cmd=`echo \ --'if [ -n "\$'${varname}'" ]; then -- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" --fi'` -- eval "$cmd" --done -+ - # Use CC/CXX to run config.tests - mkdir -p "$outpath/config.tests" - rm -f "$outpath/config.tests/.qmake.cache" --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-git/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase-git/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch deleted file mode 100644 index 7d4b32bf..00000000 --- a/recipes-qt/qt5/qtbase-git/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c57cec0fdcbc89671ef297c68554e27fbe99c09d Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Thu, 9 May 2013 10:06:50 +0200 -Subject: [PATCH 14/14] configure.prf: Allow to add extra arguments to make - -* sometimes we would like to add -e or define some variable and respect it from both - Makefiles used in configure tests and also Maakefiles to build the application - -Change-Id: Ib29beb89cc9b179dddd40d3b212b7c200d29a469 ---- - mkspecs/features/configure.prf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index b4569df..50ca562 100644 ---- a/mkspecs/features/configure.prf -+++ b/mkspecs/features/configure.prf -@@ -57,12 +57,12 @@ defineTest(qtCompileTest) { - qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" - - # Clean up after previous run -- exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean") -+ exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean") - - mkpath($$test_out_dir)|error("Aborting.") - - qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") { -- qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") { -+ qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") { - log("yes$$escape_expand(\\n)") - msg = "test $$1 succeeded" - write_file($$QMAKE_CONFIG_LOG, msg, append) --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase-native.inc b/recipes-qt/qt5/qtbase-native.inc index 87698227..c7428587 100644 --- a/recipes-qt/qt5/qtbase-native.inc +++ b/recipes-qt/qt5/qtbase-native.inc @@ -9,19 +9,21 @@ QT_MODULE = "qtbase" require qt5-native.inc -# shared with target qtbase +# shared with target qtbase, all except +# 0005-qmake-is-already-built-in-qtbase-native.patch +# 0006-Allow-building-a-separate-qmake-for-the-target.patch + SRC_URI += " \ file://0001-Add-linux-oe-g-platform.patch \ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0003-Add-external-hostbindir-option.patch \ - file://0006-qt_functions-temporary-remove-isEmpty-check.patch \ - file://0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ - file://0009-qt_module-Fix-pkgconfig-replacement.patch \ - file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \ - file://0011-qt_module-Fix-paths-in-.prl-files.patch \ - file://0012-wayland-scanner-disable-silent-rules.patch \ - file://0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ - file://0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ + file://0004-qt_functions-temporary-remove-isEmpty-check.patch \ + file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ + file://0008-qt_module-Fix-pkgconfig-replacement.patch \ + file://0009-qt_module-Fix-paths-in-.prl-files.patch \ + file://0010-wayland-scanner-disable-silent-rules.patch \ + file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ + file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ " # specific for native version diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 21a52733..5d4334ac 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -4,16 +4,15 @@ SRC_URI += " \ file://0001-Add-linux-oe-g-platform.patch \ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0003-Add-external-hostbindir-option.patch \ - file://0004-qmake-is-already-built-in-qtbase-native.patch \ - file://0005-Allow-building-a-separate-qmake-for-the-target.patch \ - file://0006-qt_functions-temporary-remove-isEmpty-check.patch \ - file://0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ - file://0009-qt_module-Fix-pkgconfig-replacement.patch \ - file://0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch \ - file://0011-qt_module-Fix-paths-in-.prl-files.patch \ - file://0012-wayland-scanner-disable-silent-rules.patch \ - file://0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ - file://0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ + file://0004-qt_functions-temporary-remove-isEmpty-check.patch \ + file://0005-qmake-is-already-built-in-qtbase-native.patch \ + file://0006-Allow-building-a-separate-qmake-for-the-target.patch \ + file://0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \ + file://0008-qt_module-Fix-pkgconfig-replacement.patch \ + file://0009-qt_module-Fix-paths-in-.prl-files.patch \ + file://0010-wayland-scanner-disable-silent-rules.patch \ + file://0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \ + file://0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch \ " DEPENDS += "qtbase-native freetype jpeg libpng zlib openssl glib-2.0 ${ICU} udev ${XCB_DEPENDS} ${GL_DEPENDS}" diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index 5907490c..f4645f69 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -1,4 +1,4 @@ -From ccf2e79173cfd0fee9f1e603107792dd5aa8e775 Mon Sep 17 00:00:00 2001 +From 4edde46f33aacc24fffa021adcc7e0d68ba414a3 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Mon, 15 Apr 2013 04:29:32 +0200 Subject: [PATCH 01/12] Add linux-oe-g++ platform @@ -31,7 +31,6 @@ Subject: [PATCH 01/12] Add linux-oe-g++ platform Upstream-Status: Pending -Change-Id: Ia0cc6a6b00ec78442d80ed2a3cf40b604588a0f6 Signed-off-by: Martin Jansa --- configure | 54 ++++++++++++++++--- diff --git a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch index 883b8096..fc8a481e 100644 --- a/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch +++ b/recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch @@ -1,7 +1,7 @@ -From 7d3de13a6d7a3142da0a5c6ebd815d343a356a23 Mon Sep 17 00:00:00 2001 +From a836731e94223d49ef05fdabe7905dd1b25c647c Mon Sep 17 00:00:00 2001 From: Holger Freyther Date: Wed, 26 Sep 2012 17:22:30 +0200 -Subject: [PATCH 02/14] qlibraryinfo: allow to set qt.conf from the outside +Subject: [PATCH 02/12] qlibraryinfo: allow to set qt.conf from the outside using the environment Allow to set a qt.conf from the outside using the environment. This allows @@ -10,7 +10,6 @@ the same qmake binary to build qt/x11 and qt/embedded Upstream-Status: Pending -Change-Id: I9247949c20a39eac8e815c175510ea3fb5bf9d33 Signed-off-by: Martin Jansa --- src/corelib/global/qlibraryinfo.cpp | 5 ++++- diff --git a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch index 14d5d52f..8c100bc5 100644 --- a/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch +++ b/recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch @@ -1,13 +1,15 @@ -From 72d8aaf00e3d722b56b66bd5fa1f1f3d3e8a8552 Mon Sep 17 00:00:00 2001 +From 3b0a595bbe9d5bce898fc5a84c9bb39c976b9f7d Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 6 Apr 2013 13:15:07 +0200 -Subject: [PATCH 03/11] Add -external-hostbindir option +Subject: [PATCH 03/12] Add -external-hostbindir option * when cross-compiling it's sometimes useful to use existing tools from machine (or in OpenEmbedded built with separate native recipe) when building for target * this way we can skip bootstraping tools we already have +Upstream-Status: Pending + Signed-off-by: Martin Jansa --- configure | 15 ++++++++++++++- @@ -156,10 +158,10 @@ index e66d9fb..a6ae763 100644 #mkspecs diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp -index c16dfcb..56a269f 100644 +index 8138fff..301643f 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp -@@ -272,7 +272,7 @@ QLibraryInfo::isDebugBuild() +@@ -270,7 +270,7 @@ QLibraryInfo::isDebugBuild() */ static const struct { @@ -168,7 +170,7 @@ index c16dfcb..56a269f 100644 } qtConfEntries[] = { { "Prefix", "." }, { "Documentation", "doc" }, // should be ${Data}/doc -@@ -293,6 +293,7 @@ static const struct { +@@ -291,6 +291,7 @@ static const struct { { "HostPrefix", "" }, { "HostBinaries", "bin" }, { "HostData", "." }, diff --git a/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch deleted file mode 100644 index f934cf1d..00000000 --- a/recipes-qt/qt5/qtbase/0004-qmake-is-already-built-in-qtbase-native.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 956195c897287787b545e570ee976d1d2917eca8 Mon Sep 17 00:00:00 2001 -From: Michael Krelin -Date: Mon, 29 Oct 2012 20:07:49 -0700 -Subject: [PATCH 04/11] qmake is already built in qtbase-native - -Ported from OE by: Yu Ke -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure b/configure -index 50f1ef2..8710c28 100755 ---- a/configure -+++ b/configure -@@ -3641,7 +3641,7 @@ setBootstrapEvalVariable() - - - # build qmake --if true; then ###[ '!' -f "$outpath/bin/qmake" ]; -+if false; then ###[ '!' -f "$outpath/bin/qmake" ]; - echo "Creating qmake. Please wait..." - - mkdir -p "$outpath/qmake" || exit --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch new file mode 100644 index 00000000..d39130c1 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0004-qt_functions-temporary-remove-isEmpty-check.patch @@ -0,0 +1,50 @@ +From ff72f8350e8b2ded813163150a7d1874061ed589 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 17 Apr 2013 18:06:25 +0200 +Subject: [PATCH 04/12] qt_functions: temporary remove isEmpty check + +* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value +* isEmpty works correctly only with qmake variables (e.g. $$FOO - + isEmpty(FOO)), but doesn't work with system properties like $$[FOO]. + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_functions.prf | 6 +++++- + mkspecs/features/qt_tool.prf | 2 +- + 2 files changed, 6 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf +index e249960..105ba4c 100644 +--- a/mkspecs/features/qt_functions.prf ++++ b/mkspecs/features/qt_functions.prf +@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) { + $$1 = $$eval(QT_TOOL.$${2}.command) + isEmpty($$1) { + $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 +- isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++ # for some reason isEmpty does not work here, FIXME before submitting upstream ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true ++ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch ++ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { + $$1 = $$[QT_HOST_BINS/get]/$$2 + } + contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { +diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf +index 5518933..b0e4f28 100644 +--- a/mkspecs/features/qt_tool.prf ++++ b/mkspecs/features/qt_tool.prf +@@ -31,7 +31,7 @@ load(qt_targets) + + # If we are doing a prefix build, create a "module" pri which enables + # qtPrepareTool() to work with the non-installed build. +-!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache):isEmpty($$[QT_EXTERNAL_HOST_BINS]) { ++!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache):!exists($$[QT_EXTERNAL_HOST_BINS]) { + + isEmpty(MODULE):MODULE = $$TARGET + +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch deleted file mode 100644 index af8eb463..00000000 --- a/recipes-qt/qt5/qtbase/0005-Allow-building-a-separate-qmake-for-the-target.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d33f33aed6744b5c4c561e6c6527d784481604f5 Mon Sep 17 00:00:00 2001 -From: Paul Eggleton -Date: Mon, 29 Oct 2012 20:26:36 -0700 -Subject: [PATCH 05/11] Allow building a separate qmake for the target - -Upstream-Status: Inappropriate [config] - -Signed-off-by: Paul Eggleton -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - qmake/qmake.pro | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/qmake/qmake.pro b/qmake/qmake.pro -index 0d92ac2..9be0e9b 100644 ---- a/qmake/qmake.pro -+++ b/qmake/qmake.pro -@@ -9,6 +9,7 @@ CONFIG -= qt shared app_bundle uic - DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \ - PROEVALUATOR_FULL PROEVALUATOR_DEBUG - DESTDIR = ../bin/ -+TARGET = qmake - - OBJECTS_DIR = . - MOC_DIR = . --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch b/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch new file mode 100644 index 00000000..319aae6f --- /dev/null +++ b/recipes-qt/qt5/qtbase/0005-qmake-is-already-built-in-qtbase-native.patch @@ -0,0 +1,30 @@ +From 240fb45541c06103e8a930beeb5ee59a15b529bf Mon Sep 17 00:00:00 2001 +From: Michael Krelin +Date: Mon, 29 Oct 2012 20:07:49 -0700 +Subject: [PATCH 05/12] qmake is already built in qtbase-native + +Ported from OE by: Yu Ke +Upstream-Status: Inappropriate [configuration] + +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + configure | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure b/configure +index 50f1ef2..8710c28 100755 +--- a/configure ++++ b/configure +@@ -3641,7 +3641,7 @@ setBootstrapEvalVariable() + + + # build qmake +-if true; then ###[ '!' -f "$outpath/bin/qmake" ]; ++if false; then ###[ '!' -f "$outpath/bin/qmake" ]; + echo "Creating qmake. Please wait..." + + mkdir -p "$outpath/qmake" || exit +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch b/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch new file mode 100644 index 00000000..c639c172 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0006-Allow-building-a-separate-qmake-for-the-target.patch @@ -0,0 +1,29 @@ +From 892351a55c3f6a033a1823e104315cb0f03b454d Mon Sep 17 00:00:00 2001 +From: Paul Eggleton +Date: Mon, 29 Oct 2012 20:26:36 -0700 +Subject: [PATCH 06/12] Allow building a separate qmake for the target + +Upstream-Status: Inappropriate [config] + +Signed-off-by: Paul Eggleton +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + qmake/qmake.pro | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/qmake/qmake.pro b/qmake/qmake.pro +index 0d92ac2..9be0e9b 100644 +--- a/qmake/qmake.pro ++++ b/qmake/qmake.pro +@@ -9,6 +9,7 @@ CONFIG -= qt shared app_bundle uic + DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED \ + PROEVALUATOR_FULL PROEVALUATOR_DEBUG + DESTDIR = ../bin/ ++TARGET = qmake + + OBJECTS_DIR = . + MOC_DIR = . +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch b/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch deleted file mode 100644 index ed238bcc..00000000 --- a/recipes-qt/qt5/qtbase/0006-qt_functions-temporary-remove-isEmpty-check.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5856e25a0653313b8f80a5a92a7817fe8eb39dc8 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 17 Apr 2013 18:06:25 +0200 -Subject: [PATCH 06/11] qt_functions: temporary remove isEmpty check - -* now we assume that every build will provide QT_EXTERNAL_HOST_BINS value - -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_functions.prf | 6 +++++- - mkspecs/features/qt_tool.prf | 2 +- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index e249960..105ba4c 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -195,7 +195,11 @@ defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.command) - isEmpty($$1) { - $$1 = $$[QT_EXTERNAL_HOST_BINS]/$$2 -- isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+ # for some reason isEmpty does not work here, FIXME before submitting upstream -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: calling built-in isEmpty(/OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/qt5) -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: test function returned true -+ # DEBUG 1: mkspecs/features/qt_functions.prf:198: taking 'then' branch -+ !exists($$[QT_EXTERNAL_HOST_BINS]/$$2) { - $$1 = $$[QT_HOST_BINS/get]/$$2 - } - contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.(exe|bat)$) { -diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf -index 5518933..b0e4f28 100644 ---- a/mkspecs/features/qt_tool.prf -+++ b/mkspecs/features/qt_tool.prf -@@ -31,7 +31,7 @@ load(qt_targets) - - # If we are doing a prefix build, create a "module" pri which enables - # qtPrepareTool() to work with the non-installed build. --!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache):isEmpty($$[QT_EXTERNAL_HOST_BINS]) { -+!build_pass:!exists($$[QT_INSTALL_PREFIX]/.qmake.cache):!exists($$[QT_EXTERNAL_HOST_BINS]) { - - isEmpty(MODULE):MODULE = $$TARGET - --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch new file mode 100644 index 00000000..c40c66b1 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0007-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch @@ -0,0 +1,29 @@ +From 9928daa856cd7433618df38b263e029fb9948679 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 22:33:33 +0200 +Subject: [PATCH 07/12] configureapp: Prefix default LIBDIRS and INCDIRS with + SYSROOT + +Upstream-Status: Pending +--- + tools/configure/configureapp.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp +index 0e01ab5..6bb7986 100644 +--- a/tools/configure/configureapp.cpp ++++ b/tools/configure/configureapp.cpp +@@ -3061,8 +3061,8 @@ void Configure::generateQConfigPri() + configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; + if (!dictionary["XQMAKESPEC"].isEmpty() && !dictionary["XQMAKESPEC"].startsWith("wince")) { + // FIXME: add detection +- configStream << "QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl; +- configStream << "QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl; ++ configStream << "QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl; ++ configStream << "QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl; + } + if (dictionary["QT_EDITION"].contains("OPENSOURCE")) + configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch b/recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch deleted file mode 100644 index 3229e14b..00000000 --- a/recipes-qt/qt5/qtbase/0008-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4ba11842fa29ba28a05b3e8e511432fe360b4957 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 22:33:33 +0200 -Subject: [PATCH 08/11] configureapp: Prefix default LIBDIRS and INCDIRS with - SYSROOT - -Change-Id: I275b30f67bc477d8e9a008f4894198859ec45017 ---- - tools/configure/configureapp.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp -index 0e01ab5..6bb7986 100644 ---- a/tools/configure/configureapp.cpp -+++ b/tools/configure/configureapp.cpp -@@ -3061,8 +3061,8 @@ void Configure::generateQConfigPri() - configStream << "QT_HOST_CPU_FEATURES = " << dictionary["QT_HOST_CPU_FEATURES"] << endl; - if (!dictionary["XQMAKESPEC"].isEmpty() && !dictionary["XQMAKESPEC"].startsWith("wince")) { - // FIXME: add detection -- configStream << "QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib" << endl; -- configStream << "QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include" << endl; -+ configStream << "QMAKE_DEFAULT_LIBDIRS = $$[QT_SYSROOT]/lib $$[QT_SYSROOT]/usr/lib" << endl; -+ configStream << "QMAKE_DEFAULT_INCDIRS = $$[QT_SYSROOT]/usr/include $$[QT_SYSROOT]/usr/local/include" << endl; - } - if (dictionary["QT_EDITION"].contains("OPENSOURCE")) - configStream << "QT_EDITION = " << QLatin1String("OpenSource") << endl; --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch b/recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch new file mode 100644 index 00000000..8d40e4f2 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0008-qt_module-Fix-pkgconfig-replacement.patch @@ -0,0 +1,68 @@ +From 063936d0daabacad8c9b8e68adf9423d54846290 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 27 Apr 2013 23:15:37 +0200 +Subject: [PATCH 08/12] qt_module: Fix pkgconfig replacement + +* in situation like this: + QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm + QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib + QT_INSTALL_LIBS/raw:/usr/lib + QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib + + I don't want the replacement like this: + sed + -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g" + -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g" + "../../lib/pkgconfig/Qt5Core.pc" + >"/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" + because that way I'll end with -L/usr/lib in .pc file which is + cross-compile unfriendly, keeping ${libdir}/${includedir} works better + in my case + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_module.prf | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 50e9469..9532377 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -191,18 +191,30 @@ unix|win32-g++* { + rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* + else: \ + rplbase = $$[QT_INSTALL_PREFIX/get] ++ pkgconfig_include_replace.match = $$rplbase/include ++ pkgconfig_include_replace.replace = "\$$\\{includedir}" ++ pkgconfig_lib_replace.match = $$rplbase/lib ++ pkgconfig_lib_replace.replace = "\$$\\{libdir}" + include_replace.match = $$rplbase/include + include_replace.replace = $$[QT_INSTALL_HEADERS/raw] + lib_replace.match = $$rplbase/lib + lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" ++ ++ !isEmpty(SYSROOT): \ ++ rplbase = $$[SYSROOT] \ ++ lafile_replace.match = $$rplbase \ ++ lafile_replace.replace = "=" \ ++ ++ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace + } + + unix { + CONFIG += create_libtool explicitlib + QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace + QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] +- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace ++ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace + } + + unix|win32-g++* { +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch new file mode 100644 index 00000000..dde3b95b --- /dev/null +++ b/recipes-qt/qt5/qtbase/0009-qt_module-Fix-paths-in-.prl-files.patch @@ -0,0 +1,62 @@ +From 1a0133993cc7924208dd4a0d818599accbcf999e Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 28 Apr 2013 12:56:55 +0200 +Subject: [PATCH 09/12] qt_module: Fix paths in .prl files + +* 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 +* 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 + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- + 1 file changed, 17 insertions(+), 11 deletions(-) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 9532377..73053f7 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -195,17 +195,23 @@ unix|win32-g++* { + pkgconfig_include_replace.replace = "\$$\\{includedir}" + pkgconfig_lib_replace.match = $$rplbase/lib + pkgconfig_lib_replace.replace = "\$$\\{libdir}" +- include_replace.match = $$rplbase/include +- include_replace.replace = $$[QT_INSTALL_HEADERS/raw] +- lib_replace.match = $$rplbase/lib +- lib_replace.replace = $$[QT_INSTALL_LIBS/raw] +- lafile_replace.match = $$rplbase +- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" +- +- !isEmpty(SYSROOT): \ +- rplbase = $$[SYSROOT] \ +- lafile_replace.match = $$rplbase \ +- lafile_replace.replace = "=" \ ++ !exists($$[QT_SYSROOT]) { ++ include_replace.match = $$rplbase/include ++ include_replace.replace = $$[QT_INSTALL_HEADERS/raw] ++ lib_replace.match = $$rplbase/lib ++ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]" ++ } else { ++ # include_replace and lib_replace are duplicate, but we don't want to ++ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional ++ include_replace.match = $$rplbase ++ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] ++ lib_replace.match = $$rplbase ++ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] ++ lafile_replace.match = $$rplbase ++ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" ++ } + + QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace + } +-- +1.8.2.1 + 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 @@ -From 4ba266bc0a7e4841cfd06d555b39888928a6e3a5 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 23:15:37 +0200 -Subject: [PATCH 09/11] qt_module: Fix pkgconfig replacement - -* in situation like this: - QT_SYSROOT:/OE/oe-core/tmp-eglibc/sysroots/qemuarm - QT_INSTALL_LIBS:/OE/oe-core/tmp-eglibc/sysroots/qemuarm/usr/lib - QT_INSTALL_LIBS/raw:/usr/lib - QT_INSTALL_LIBS/get:/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib - - I don't want the replacement like this: - sed - -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/include,/usr/include/qt5,g" - -e "s,/OE/oe-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/qtbase/5.0.0-r0.0/build/lib,/usr/lib,g" - "../../lib/pkgconfig/Qt5Core.pc" - >"/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" - because that way I'll end with -L/usr/lib in .pc file which is - cross-compile unfriendly, keeping ${libdir}/${includedir} works better - in my case - -Change-Id: Id0f9143c012b7fe7bb7bab0055687f4e0517f653 -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_module.prf | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 50e9469..9532377 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -191,18 +191,30 @@ unix|win32-g++* { - rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* - else: \ - rplbase = $$[QT_INSTALL_PREFIX/get] -+ pkgconfig_include_replace.match = $$rplbase/include -+ pkgconfig_include_replace.replace = "\$$\\{includedir}" -+ pkgconfig_lib_replace.match = $$rplbase/lib -+ pkgconfig_lib_replace.replace = "\$$\\{libdir}" - include_replace.match = $$rplbase/include - include_replace.replace = $$[QT_INSTALL_HEADERS/raw] - lib_replace.match = $$rplbase/lib - lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -- QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -+ -+ !isEmpty(SYSROOT): \ -+ rplbase = $$[SYSROOT] \ -+ lafile_replace.match = $$rplbase \ -+ lafile_replace.replace = "=" \ -+ -+ QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace - } - - unix { - CONFIG += create_libtool explicitlib - QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace - QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS/raw] -- QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace -+ QMAKE_LIBTOOL_INSTALL_REPLACE += lafile_replace - } - - unix|win32-g++* { --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch b/recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch deleted file mode 100644 index 7594058f..00000000 --- a/recipes-qt/qt5/qtbase/0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5b01ec1b8da7fc949efea262647a9d6010c670f4 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 27 Apr 2013 22:51:54 +0200 -Subject: [PATCH 10/11] qmake/property: rename QT_INSTALL_CONFIGURATION to - QT_INSTALL_SETTINGS - -* this variable is referenced from configure and configureapp.cpp as QT_INSTALL_SETTINGS - property.cpp was only place using name QT_INSTALL_CONFIGURATION - -Upstream-Status: Submitted -https://codereview.qt-project.org/54912 - -Change-Id: I3ba40d5f8773fe9aea728c5b2418aa55cecc92da ---- - qmake/property.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/qmake/property.cpp b/qmake/property.cpp -index dca0c58..8ebba3b 100644 ---- a/qmake/property.cpp -+++ b/qmake/property.cpp -@@ -68,7 +68,7 @@ static const struct { - { "QT_INSTALL_IMPORTS", QLibraryInfo::ImportsPath, false }, - { "QT_INSTALL_QML", QLibraryInfo::Qml2ImportsPath, false }, - { "QT_INSTALL_TRANSLATIONS", QLibraryInfo::TranslationsPath, false }, -- { "QT_INSTALL_CONFIGURATION", QLibraryInfo::SettingsPath, false }, -+ { "QT_INSTALL_SETTINGS", QLibraryInfo::SettingsPath, false }, - { "QT_INSTALL_EXAMPLES", QLibraryInfo::ExamplesPath, false }, - { "QT_INSTALL_DEMOS", QLibraryInfo::ExamplesPath, false }, // Just backwards compat - { "QT_HOST_PREFIX", QLibraryInfo::HostPrefixPath, true }, --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch new file mode 100644 index 00000000..ff8aaa1d --- /dev/null +++ b/recipes-qt/qt5/qtbase/0010-wayland-scanner-disable-silent-rules.patch @@ -0,0 +1,46 @@ +From 668c20fe721aba2057c8e929e5029c423a687360 Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sun, 5 May 2013 11:18:34 +0200 +Subject: [PATCH 10/12] wayland-scanner: disable silent rules + +* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/wayland-scanner.prf | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf +index 90e1e0f..0750849 100644 +--- a/mkspecs/features/wayland-scanner.prf ++++ b/mkspecs/features/wayland-scanner.prf +@@ -10,7 +10,7 @@ wayland-server-header.variable_out = HEADERS + wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} + wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} + +-silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands ++#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands + QMAKE_EXTRA_COMPILERS += wayland-server-header + + wayland-client-header.name = wayland ${QMAKE_FILE_BASE} +@@ -19,7 +19,7 @@ wayland-client-header.variable_out = HEADERS + wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} + wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} + +-silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands ++#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands + QMAKE_EXTRA_COMPILERS += wayland-client-header + + wayland-code.name = wayland ${QMAKE_FILE_BASE} +@@ -28,5 +28,5 @@ wayland-code.variable_out = SOURCES + wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c + wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} + +-silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands ++#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands + QMAKE_EXTRA_COMPILERS += wayland-code +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch new file mode 100644 index 00000000..d1402124 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0011-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch @@ -0,0 +1,44 @@ +From 62c2c404238e007021a80fcf62b51173be23a67e Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Wed, 8 May 2013 23:54:35 +0200 +Subject: [PATCH 11/12] configure: don't export SYSTEM_VARIABLES to .qmake.vars + +* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is + causing issues as we need g++ to be used as linker + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + configure | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) + +diff --git a/configure b/configure +index 8710c28..8b97cc2 100755 +--- a/configure ++++ b/configure +@@ -740,20 +740,7 @@ fi'` + done + + SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" +-for varname in $SYSTEM_VARIABLES; do +- qmakevarname="${varname}" +- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS +- if [ "${varname}" = "LDFLAGS" ]; then +- qmakevarname="LFLAGS" +- elif [ "${varname}" = "LD" ]; then +- qmakevarname="LINK" +- fi +- cmd=`echo \ +-'if [ -n "\$'${varname}'" ]; then +- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" +-fi'` +- eval "$cmd" +-done ++ + # Use CC/CXX to run config.tests + mkdir -p "$outpath/config.tests" + rm -f "$outpath/config.tests/.qmake.cache" +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch b/recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch deleted file mode 100644 index 6eab1cb5..00000000 --- a/recipes-qt/qt5/qtbase/0011-qt_module-Fix-paths-in-.prl-files.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 1809b8b32d3b8a689eb5d40f096b3541345ff219 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 28 Apr 2013 12:56:55 +0200 -Subject: [PATCH 11/11] qt_module: Fix paths in .prl files - -* 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 -* 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 - -Change-Id: I4b66dcad539a3ba876d8e4ee2eb2ccd626cd03ea -Signed-off-by: Martin Jansa ---- - mkspecs/features/qt_module.prf | 28 +++++++++++++++++----------- - 1 file changed, 17 insertions(+), 11 deletions(-) - -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 9532377..73053f7 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -195,17 +195,23 @@ unix|win32-g++* { - pkgconfig_include_replace.replace = "\$$\\{includedir}" - pkgconfig_lib_replace.match = $$rplbase/lib - pkgconfig_lib_replace.replace = "\$$\\{libdir}" -- include_replace.match = $$rplbase/include -- include_replace.replace = $$[QT_INSTALL_HEADERS/raw] -- lib_replace.match = $$rplbase/lib -- lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -- lafile_replace.match = $$rplbase -- lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -- -- !isEmpty(SYSROOT): \ -- rplbase = $$[SYSROOT] \ -- lafile_replace.match = $$rplbase \ -- lafile_replace.replace = "=" \ -+ !exists($$[QT_SYSROOT]) { -+ include_replace.match = $$rplbase/include -+ include_replace.replace = $$[QT_INSTALL_HEADERS/raw] -+ lib_replace.match = $$rplbase/lib -+ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "$$[QT_INSTALL_PREFIX/raw]" -+ } else { -+ # include_replace and lib_replace are duplicate, but we don't want to -+ # make QMAKE_PKGCONFIG_INSTALL_REPLACE, QMAKE_PRL_INSTALL_REPLACE conditional -+ include_replace.match = $$rplbase -+ include_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] -+ lib_replace.match = $$rplbase -+ lib_replace.replace = $$[QT_SYSROOT]$$[QT_INSTALL_PREFIX/raw] -+ lafile_replace.match = $$rplbase -+ lafile_replace.replace = "=$$[QT_INSTALL_PREFIX/raw]" -+ } - - QMAKE_PKGCONFIG_INSTALL_REPLACE += pkgconfig_include_replace pkgconfig_lib_replace - } --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch new file mode 100644 index 00000000..5d7cbc34 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0012-configure.prf-Allow-to-add-extra-arguments-to-make.patch @@ -0,0 +1,37 @@ +From b0a008c649f76e0353f49f9c953e9d8141e5927a Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Thu, 9 May 2013 10:06:50 +0200 +Subject: [PATCH 12/12] configure.prf: Allow to add extra arguments to make + +* sometimes we would like to add -e or define some variable and respect it from both + Makefiles used in configure tests and also Makefiles to build the application + +Upstream-Status: Pending + +Signed-off-by: Martin Jansa +--- + mkspecs/features/configure.prf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf +index 39144e7..de48b07 100644 +--- a/mkspecs/features/configure.prf ++++ b/mkspecs/features/configure.prf +@@ -54,12 +54,12 @@ defineTest(qtCompileTest) { + qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" + + # Clean up after previous run +- exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean") ++ exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean") + + mkpath($$test_out_dir)|error("Aborting.") + + qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") { +- qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") { ++ qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") { + log("yes$$escape_expand(\\n)") + msg = "test $$1 succeeded" + write_file($$QMAKE_CONFIG_LOG, msg, append) +-- +1.8.2.1 + diff --git a/recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch b/recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch deleted file mode 100644 index 9431e79e..00000000 --- a/recipes-qt/qt5/qtbase/0012-wayland-scanner-disable-silent-rules.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 41a352655485234eda87b150154001ce89496505 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sun, 5 May 2013 11:18:34 +0200 -Subject: [PATCH 12/12] wayland-scanner: disable silent rules - -* for some reason "$$qtwayland-server-header.commands" on second line gets expanded as -server-header.commands - -Change-Id: I1ffb04c01311f08984bc2a8c1cc92cb963d3e147 -Signed-off-by: Martin Jansa ---- - mkspecs/features/wayland-scanner.prf | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mkspecs/features/wayland-scanner.prf b/mkspecs/features/wayland-scanner.prf -index 90e1e0f..0750849 100644 ---- a/mkspecs/features/wayland-scanner.prf -+++ b/mkspecs/features/wayland-scanner.prf -@@ -10,7 +10,7 @@ wayland-server-header.variable_out = HEADERS - wayland-server-header.output = wayland-${QMAKE_FILE_BASE}-server-protocol$${first(QMAKE_EXT_H)} - wayland-server-header.commands = $$QMAKE_WAYLAND_SCANNER server-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} - --silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands -+#silent:wayland-server-header.commands = @echo Wayland server header ${QMAKE_FILE_IN} && $$wayland-server-header.commands - QMAKE_EXTRA_COMPILERS += wayland-server-header - - wayland-client-header.name = wayland ${QMAKE_FILE_BASE} -@@ -19,7 +19,7 @@ wayland-client-header.variable_out = HEADERS - wayland-client-header.output = wayland-${QMAKE_FILE_BASE}-client-protocol$${first(QMAKE_EXT_H)} - wayland-client-header.commands = $$QMAKE_WAYLAND_SCANNER client-header < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} - --silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands -+#silent:wayland-client-header.commands = @echo Wayland client header ${QMAKE_FILE_IN} && $$wayland-client-header.commands - QMAKE_EXTRA_COMPILERS += wayland-client-header - - wayland-code.name = wayland ${QMAKE_FILE_BASE} -@@ -28,5 +28,5 @@ wayland-code.variable_out = SOURCES - wayland-code.output = wayland-${QMAKE_FILE_BASE}-protocol.c - wayland-code.commands = $$QMAKE_WAYLAND_SCANNER code < ${QMAKE_FILE_IN} > ${QMAKE_FILE_OUT} - --silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands -+#silent:wayland-code.commands = @echo Wayland code header ${QMAKE_FILE_IN} && $$wayland-code.commands - QMAKE_EXTRA_COMPILERS += wayland-code --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch b/recipes-qt/qt5/qtbase/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch deleted file mode 100644 index d4a11d1e..00000000 --- a/recipes-qt/qt5/qtbase/0013-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ec6de65fc787c8a5e782b48b6794646f274da43a Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Wed, 8 May 2013 23:54:35 +0200 -Subject: [PATCH 13/13] configure: don't export SYSTEM_VARIABLES to .qmake.vars - -* linux-oe-g++ should handle this correctly and exporting LD as QMAKE_LINK is - causing issues as we need g++ to be used as linker - -Change-Id: I22e32aabd502df9f84cebb82f17bec4099363c8e -Signed-off-by: Martin Jansa ---- - configure | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/configure b/configure -index feb1435..6d3d1e2 100755 ---- a/configure -+++ b/configure -@@ -740,20 +740,7 @@ fi'` - done - - SYSTEM_VARIABLES="RANLIB STRIP OBJDUMP LD CC CXX CFLAGS CXXFLAGS LDFLAGS" --for varname in $SYSTEM_VARIABLES; do -- qmakevarname="${varname}" -- # use LDFLAGS for autoconf compat, but qmake uses QMAKE_LFLAGS -- if [ "${varname}" = "LDFLAGS" ]; then -- qmakevarname="LFLAGS" -- elif [ "${varname}" = "LD" ]; then -- qmakevarname="LINK" -- fi -- cmd=`echo \ --'if [ -n "\$'${varname}'" ]; then -- QMakeVar set QMAKE_'${qmakevarname}' "\$'${varname}'" --fi'` -- eval "$cmd" --done -+ - # Use CC/CXX to run config.tests - mkdir -p "$outpath/config.tests" - rm -f "$outpath/config.tests/.qmake.cache" --- -1.8.2.1 - diff --git a/recipes-qt/qt5/qtbase/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch b/recipes-qt/qt5/qtbase/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch deleted file mode 100644 index 79d314c5..00000000 --- a/recipes-qt/qt5/qtbase/0014-configure.prf-Allow-to-add-extra-arguments-to-make.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 01653e270c4a9169a32c0002a87a6644727d0b11 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Thu, 9 May 2013 10:06:50 +0200 -Subject: [PATCH 14/14] configure.prf: Allow to add extra arguments to make - -* sometimes we would like to add -e or define some variable and respect it from both - Makefiles used in configure tests and also Maakefiles to build the application - -Change-Id: Ib29beb89cc9b179dddd40d3b212b7c200d29a469 ---- - mkspecs/features/configure.prf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mkspecs/features/configure.prf b/mkspecs/features/configure.prf -index 39144e7..1864ba8 100644 ---- a/mkspecs/features/configure.prf -+++ b/mkspecs/features/configure.prf -@@ -54,12 +54,12 @@ defineTest(qtCompileTest) { - qmake_configs = "\"CONFIG -= qt debug_and_release app_bundle lib_bundle\"" - - # Clean up after previous run -- exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE distclean") -+ exists($$test_out_dir/Makefile):qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS) distclean") - - mkpath($$test_out_dir)|error("Aborting.") - - qtRunLoggedCommand("$$test_cmd_base $$system_quote($$system_path($$QMAKE_QMAKE)) $$qmake_configs $$shell_quote($$test_dir)") { -- qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE") { -+ qtRunLoggedCommand("$$test_cmd_base $$QMAKE_MAKE $$(QMAKE_MAKE_ARGS)") { - log("yes$$escape_expand(\\n)") - msg = "test $$1 succeeded" - write_file($$QMAKE_CONFIG_LOG, msg, append) --- -1.8.2.1 - -- cgit v1.2.3-54-g00ecf