qtbwebengine: fix build for qemux86-64

PATCH New Martin Jansa 1 participant 1 message Dec 11, 2014

Share & tools

Martin Jansa

author

2014-12-11 17:42 UTC #0 lore raw

PATCH 1/1 qtbwebengine: fix build for qemux86-64

* it was applied only for qtwebengine_5.3.2+git.bb, then removed completely with 5.4.0 upgrade, but it's still needed for both versions

Signed-off-by Martin Jansa <[email protected]>

---
 ...nclude-atomicops_internals_x86_gcc.cc-whe.patch | 27 ++++++++++++++++++++++
 recipes-qt/qt5/qtwebengine_5.4.0.bb                |  1 +
 recipes-qt/qt5/qtwebengine_git.bb                  |  1 +
 3 files changed, 29 insertions(+)
 create mode 100644 recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch

recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch new file +27 -0

new file mode 100644
index 0000000..032fe4d
@@ -0,0 +1,27 @@
+From 41b142ec46c61d075b5cd95a88b57f0db74cbf31 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <[email protected]>
+Date: Fri, 3 Oct 2014 03:52:11 +0200
+Subject: [PATCH] base.gypi: include atomicops_internals_x86_gcc.cc when
+ building for x64 arch
+
+Signed-off-by: Martin Jansa <[email protected]>
+---
+ chromium/base/base.gypi | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi
+index a5a990a..af30cfa 100644
+--- a/src/3rdparty/chromium/base/base.gypi
++++ b/src/3rdparty/chromium/base/base.gypi
+@@ -745,7 +745,7 @@
+                 ['include', '^nix/'],
+               ],
+           }],
+-          ['use_qt==1 and target_arch=="ia32"', {
++          ['use_qt==1 and target_arch=="ia32" or target_arch=="x64"', {
+               'sources/': [
+                 ['include', 'atomicops_internals_x86_gcc.cc'],
+               ],
+-- 
+2.1.3
+

recipes-qt/qt5/qtwebengine_5.4.0.bb +1 -0

index 85ac397..e74a739 100644
@@ -8,4 +8,5 @@ SRC_URI += " \
     file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
     file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
     file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
+    file://0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch \
 "

recipes-qt/qt5/qtwebengine_git.bb +1 -0

index 31467cb..2f10e13 100644
@@ -9,6 +9,7 @@ SRC_URI += " \
     file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \
     file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
     file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
+    file://0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch \
 "
 SRCREV_qtwebengine = "8eefc3a0658d1b10de12f43534cfd63af825ebc8"
 SRCREV_chromium = "be4ec3fa64a4c6c2b641830a9811ab7847c7dd39"

Signature · 1 line

2.1.3