From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-qt5][PATCH 3/7] qtbwebengine: fix build for qemux86-64
Date: Sat, 4 Oct 2014 04:25:54 +0200 [thread overview]
Message-ID: <1412389558-13237-3-git-send-email-Martin.Jansa@gmail.com> (raw)
In-Reply-To: <1412389558-13237-1-git-send-email-Martin.Jansa@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
...nclude-atomicops_internals_x86_gcc.cc-whe.patch | 27 ++++++++++++++++++++++
recipes-qt/qt5/qtwebengine_git.bb | 1 +
2 files changed, 28 insertions(+)
create mode 100644 recipes-qt/qt5/qtwebengine/0003-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch
diff --git a/recipes-qt/qt5/qtwebengine/0003-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch b/recipes-qt/qt5/qtwebengine/0003-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch
new file mode 100644
index 0000000..1cf1242
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0003-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch
@@ -0,0 +1,27 @@
+From 9ad77853050ccd2102fe4c9ad0671b82554ce4c1 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+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 <Martin.Jansa@gmail.com>
+---
+ 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.1
+
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 08486df..dd93d1f 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -20,6 +20,7 @@ SRC_URI = " \
file://0003-functions.prf-Try-to-add-_moc-suffix.patch \
file://0001-chromium-Drop-build-time-only-dependency-on-x11-libr.patch \
file://0002-chromium-Strip-unwanted-echo-compiling-prefix-from-C.patch \
+ file://0003-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch \
"
SRCREV_qtwebengine = "21f6ce84ecca9a4ff2aa980b21d2e5174c78d14b"
SRCREV_chromium = "1f3cc8c2618979b557d60ef1ad984a49dca83bff"
--
2.1.1
next prev parent reply other threads:[~2014-10-04 2:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-04 2:25 [meta-qt5][PATCH 1/7] qt5: Add Qt 5.3.2 packages Martin Jansa
2014-10-04 2:25 ` [meta-qt5][PATCH 2/7] qtwebengine: update repository location Martin Jansa
2014-10-04 2:25 ` Martin Jansa [this message]
2014-10-04 2:25 ` [meta-qt5][PATCH 4/7] qt*: refresh the patches Martin Jansa
2014-10-04 2:25 ` [meta-qt5][PATCH 5/7] qtbase: Drop dont-process configure option Martin Jansa
2014-10-04 2:25 ` [meta-qt5][PATCH 6/7] qtwayland-native: remove qtwaylandscanner symlink Martin Jansa
2014-10-04 2:25 ` [meta-qt5][PATCH 7/7] qt5: upgrade git recipes to 5.4-alpha1 Martin Jansa
2014-10-04 15:49 ` Martin Jansa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1412389558-13237-3-git-send-email-Martin.Jansa@gmail.com \
--to=martin.jansa@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.