diff options
| author | Schrempf Frieder <frieder.schrempf@exceet.de> | 2017-02-16 16:05:58 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-02-26 12:25:34 +0100 |
| commit | 61c02506f6f6689e81b3ff709ea2fa28a18bc964 (patch) | |
| tree | 0f839fa1ce5e62d42d8807981d15239521054997 | |
| parent | ee301d84a763f9a23499533ecd7cef20643b9431 (diff) | |
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>
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 1 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase-native_git.bb | 1 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 6 |
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 += "\ file://0003-Add-external-hostbindir-option.patch \ file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ file://0005-configure-bump-path-length-from-256-to-512-character.patch \ - file://0008-configure-paths-for-target-qmake-properly.patch \ file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ " 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 += "\ file://0003-Add-external-hostbindir-option.patch \ file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ file://0005-configure-bump-path-length-from-256-to-512-character.patch \ - file://0008-configure-paths-for-target-qmake-properly.patch \ file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ " 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 += "\ file://0003-Add-external-hostbindir-option.patch \ file://0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch \ file://0005-configure-bump-path-length-from-256-to-512-character.patch \ - file://0008-configure-paths-for-target-qmake-properly.patch \ file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ " +# only for target qtbase +SRC_URI += "\ + file://0008-configure-paths-for-target-qmake-properly.patch \ +" + DEPENDS += "qtbase-native" # LGPL-3.0 is used only in src/plugins/platforms/android/extract.cpp |