summaryrefslogtreecommitdiffstats
path: root/recipes-qt
diff options
context:
space:
mode:
authorSchrempf Frieder <frieder.schrempf@exceet.de>2017-02-16 16:05:58 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2017-02-26 12:25:34 +0100
commit61c02506f6f6689e81b3ff709ea2fa28a18bc964 (patch)
tree0f839fa1ce5e62d42d8807981d15239521054997 /recipes-qt
parentee301d84a763f9a23499533ecd7cef20643b9431 (diff)
downloadmeta-qt5-61c02506f6f6689e81b3ff709ea2fa28a18bc964.tar.gz
qtbase-native: nativesdk-qtbase: remove patch that breaks mkspec setting for SDK
The patch 0008-configure-paths-for-target-qmake-properly.patch seems to be intended for the target, not for native/nativesdk, as it breaks the mkspec setting (sets linux-g++ instead of linux-oe-g++) by default. This issue is also described here: https://github.com/graugans/meta-udoo/issues/20#issuecomment-261241783 Signed-off-by: Frieder Schrempf <frieder.schrempf@exceet.de> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt')
-rw-r--r--recipes-qt/qt5/nativesdk-qtbase_git.bb1
-rw-r--r--recipes-qt/qt5/qtbase-native_git.bb1
-rw-r--r--recipes-qt/qt5/qtbase_git.bb6
3 files changed, 5 insertions, 3 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 7a4c1139..94ad6b9a 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -31,7 +31,6 @@ SRC_URI += "\
31 file://0003-Add-external-hostbindir-option.patch \ 31 file://0003-Add-external-hostbindir-option.patch \
32 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ 32 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
33 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 33 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
34 file://0008-configure-paths-for-target-qmake-properly.patch \
35 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ 34 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \
36 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 35 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
37" 36"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb
index 9cd3dfcc..fbaa5ee1 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -26,7 +26,6 @@ SRC_URI += "\
26 file://0003-Add-external-hostbindir-option.patch \ 26 file://0003-Add-external-hostbindir-option.patch \
27 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ 27 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
28 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 28 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
29 file://0008-configure-paths-for-target-qmake-properly.patch \
30 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ 29 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \
31 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 30 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
32" 31"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index ecdc7634..4e1ab72c 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -21,11 +21,15 @@ SRC_URI += "\
21 file://0003-Add-external-hostbindir-option.patch \ 21 file://0003-Add-external-hostbindir-option.patch \
22 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ 22 file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \
23 file://0005-configure-bump-path-length-from-256-to-512-character.patch \ 23 file://0005-configure-bump-path-length-from-256-to-512-character.patch \
24 file://0008-configure-paths-for-target-qmake-properly.patch \
25 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ 24 file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \
26 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ 25 file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
27" 26"
28 27
28# only for target qtbase
29SRC_URI += "\
30 file://0008-configure-paths-for-target-qmake-properly.patch \
31"
32
29DEPENDS += "qtbase-native" 33DEPENDS += "qtbase-native"
30 34
31# LGPL-3.0 is used only in src/plugins/platforms/android/extract.cpp 35# LGPL-3.0 is used only in src/plugins/platforms/android/extract.cpp