qtwebkit: Fix build on armv7ve (rpi)
PATCH 1/2 qtwebkit: Fix build on armv7ve (rpi)
--- recipes-qt/qt5/qtwebkit_git.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+)
recipes-qt/qt5/qtwebkit_git.bb +13 -0
@@ -18,6 +18,19 @@ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf- ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" +# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 +# https://bugs.webkit.org/show_bug.cgi?id=159880 +# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. +# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). +ARM_INSTRUCTION_SET_armv7a = "thumb" +ARM_INSTRUCTION_SET_armv7r = "thumb" +ARM_INSTRUCTION_SET_armv7ve = "thumb" + +# qemu: uncaught target signal 11 (Segmentation fault) - core dumped +# Segmentation fault +GI_DATA_ENABLED_armv7a = "False" +GI_DATA_ENABLED_armv7ve = "False" + # Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.10 # 5.10.meta-qt5.1 SRC_URI += "\
Signature · 1 line
2.16.2
PATCH 2/2 qtwebkit: Update to latest on 5.9 branch
--- recipes-qt/qt5/qtwebkit_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-qt/qt5/qtwebkit_git.bb +1 -1
@@ -102,4 +102,4 @@ export RUBYLIB="${STAGING_DATADIR_NATIVE}/rubygems:${STAGING_LIBDIR_NATIVE}/ruby QT_MODULE_BRANCH = "5.9" -SRCREV = "97c4a80a1282c8c3eaa343011286b76fd4838c5f" +SRCREV = "bd0657f98aff85b9f06d85a8cf4da6a27f61a56e"
Signature · 1 line
2.16.2
Quoted 30 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- recipes-qt/qt5/qtwebkit_git.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+)recipes-qt/qt5/qtwebkit_git.bb +13
-1@@ -18,6 +18,19 @@ DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf- ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" +# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 +# https://bugs.webkit.org/show_bug.cgi?id=159880 +# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. +# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2 (-mthumb). +ARM_INSTRUCTION_SET_armv7a = "thumb" +ARM_INSTRUCTION_SET_armv7r = "thumb" +ARM_INSTRUCTION_SET_armv7ve = "thumb" + +# qemu: uncaught target signal 11 (Segmentation fault) - core dumped +# Segmentation fault +GI_DATA_ENABLED_armv7a = "False" +GI_DATA_ENABLED_armv7ve = "False" + # Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.10 # 5.10.meta-qt5.1 SRC_URI += "\ --
Quoted 2 lines
2.16.2
Hmm strange - my builds for Rpi are fine. Are you sure that this is not caused by musl in particular gi part?
Andreas
Quoted 30 lines · Andreas Müller
recipes-qt/qt5/
Quoted 6 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- recipes-qt/qt5/qtwebkit_git.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+)recipes-qt/qt5/ renamed from recipes-qt/qt5/qtwebkit_git.bb +0
-0qtwebkit_git.bb
recipes-qt/qt5/qtwebkit_git.bb DEPENDS += "qtbase qtdeclarative icu ruby-native
Quoted 4 lines
index b23d4d6..0f5cbbc 100644
recipes-qt/qt5/qtwebkit_git.bb +0
-0@@ -18,6 +18,19 @@ DEPENDS += "qtbase qtdeclarative icu ruby-nativesqlite3 glib-2.0 libxslt gperf-
recipes-qt/qt5/qtwebkit_git.bb DEPENDS += "qtbase qtdeclarative icu ruby-native sqlite3 glib-2.0 libxslt gperf-
Quoted 7 lines
recipes-qt/qt5/qtwebkit_git.bb +4
-0ARM_INSTRUCTION_SET_armv4 = "arm" ARM_INSTRUCTION_SET_armv5 = "arm" +# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 +# https://bugs.webkit.org/show_bug.cgi?id=159880 +# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. +# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2(-mthumb).
Quoted 9 lines
recipes-qt/qt5/qtwebkit_git.bb +9
-0+ARM_INSTRUCTION_SET_armv7a = "thumb" +ARM_INSTRUCTION_SET_armv7r = "thumb" +ARM_INSTRUCTION_SET_armv7ve = "thumb" + +# qemu: uncaught target signal 11 (Segmentation fault) - core dumped +# Segmentation fault +GI_DATA_ENABLED_armv7a = "False" +GI_DATA_ENABLED_armv7ve = "False" +
Quoted 8 lines
Quoted 6 lines
recipes-qt/qt5/qtwebkit_git.bb +0
-1# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.10 # 5.10.meta-qt5.1 SRC_URI += "\ --2.16.2
Hmm strange - my builds for Rpi are fine. Are you sure that this is not caused by musl in particular gi part?
I transplanted it from oe core the thumb instruction set it what I was needing I have to test a build without it and you might be right about musl I should check that too
Quoted 4 lines
Andreas
Quoted 44 lines · Khem Raj
Quoted 31 lines · Andreas Müller
Quoted 29 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- recipes-qt/qt5/qtwebkit_git.bb | 13 +++++++++++++ 1 file changed, 13 insertions(+)recipes-qt/qt5/qtwebkit_git.bb +0
-0@@ -18,6 +18,19 @@ DEPENDS += "qtbase qtdeclarative icu ruby-nativesqlite3 glib-2.0 libxslt gperf-
ARM_INSTRUCTION_SET_armv4= "arm"
ARM_INSTRUCTION_SET_armv5= "arm"recipes-qt/qt5/qtwebkit_git.bb +4
-0+# https://bugzilla.yoctoproject.org/show_bug.cgi?id=9474 +# https://bugs.webkit.org/show_bug.cgi?id=159880 +# JSC JIT can build on ARMv7 with -marm, but doesn't work on runtime. +# Upstream only tests regularly the JSC JIT on ARMv7 with Thumb2(-mthumb).
recipes-qt/qt5/qtwebkit_git.bb +9
-0+ARM_INSTRUCTION_SET_armv7a = "thumb" +ARM_INSTRUCTION_SET_armv7r = "thumb" +ARM_INSTRUCTION_SET_armv7ve = "thumb" + +# qemu: uncaught target signal 11 (Segmentation fault) - core dumped +# Segmentation fault +GI_DATA_ENABLED_armv7a = "False" +GI_DATA_ENABLED_armv7ve = "False" +Quoted 8 lines
Quoted 6 lines
# Patches from https://github.com/meta-qt5/qtwebkit/commits/b5.10
# 5.10.meta-qt5.1
SRC_URI+= "\
--
2.16.2Hmm strange - my builds for Rpi are fine. Are you sure that this is not caused by musl in particular gi part?
Quoted 4 lines
I transplanted it from oe core the thumb instruction set it what I was needing I have to test a build without it and you might be right about musl I should check that too
Quoted 1 line
I have checked this further for the GI_DATA_ENABLED part:
qemu/gobject-introspection at qtwebkit?? I found it at webkitgtk. Seems your copying was a bit over enthuisastic :)
Andreas