On 17.02.2017 21:10, Martin Jansa wrote:
On Thu, Feb 16, 2017 at 04:05:58PM +0100, Frieder Schrempf wrote:
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
On which branch was this tested?
It doesn't apply for master:
OE @ ~/meta-qt5 $ pwam 137257
2017-02-17 21:07:37 URL:https://patchwork.openembedded.org/patch/137257/mbox/ [2388] ->
"pw-am-137257.patch" [1]
Applying: qtbase-native: nativesdk-qtbase: remove patch that breaks mkspec
setting for SDK
error: patch failed: recipes-qt/qt5/nativesdk-qtbase_git.bb:33
error: recipes-qt/qt5/nativesdk-qtbase_git.bb: patch does not apply
error: patch failed: recipes-qt/qt5/qtbase-native_git.bb:28
error: recipes-qt/qt5/qtbase-native_git.bb: patch does not apply
Patch failed at 0001 qtbase-native: nativesdk-qtbase: remove patch that breaks
mkspec setting for SDK
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
I've applied it manually for master, but next time please send patches rebased
and tested on recent master.
Sorry, it was based on morty. I will remember to rebase and test on
master next time.
Signed-off-by: Frieder Schrempf <[email protected]>
---
recipes-qt/qt5/nativesdk-qtbase_git.bb | 1 -
recipes-qt/qt5/qtbase-native_git.bb | 1 -
2 files changed, 2 deletions(-)
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb
b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 47e204b..e64c30e 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -33,7 +33,6 @@ SRC_URI += "\
file://0005-configure-bump-path-length-from-256-to-512-character.patch \
file://0006-QOpenGLPaintDevice-sub-area-support.patch \
file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
- file://0008-configure-paths-for-target-qmake-properly.patch \
file://0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.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 ec4a9b6..c6a847a 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -28,7 +28,6 @@ SRC_URI += "\
file://0005-configure-bump-path-length-from-256-to-512-character.patch \
file://0006-QOpenGLPaintDevice-sub-area-support.patch \
file://0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
- file://0008-configure-paths-for-target-qmake-properly.patch \
file://0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch \
file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \
"
--
2.7.4
--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
