summaryrefslogtreecommitdiffstats
path: root/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-04-28 16:42:42 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-29 12:57:17 +0200
commit48556b7cf328309ab493824dd650d508a05758a2 (patch)
treeaa5c454946e7c822456bd055595594f98084b809 /patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch
parentc588754eb497f1b4e6a1daf23210e883b3de7669 (diff)
Update patches with fixes for the emulator and raspberry pi
Change-Id: I475941acdaa2581851f69199c0ecda7edddab389 Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch')
-rw-r--r--patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch15
1 files changed, 10 insertions, 5 deletions
diff --git a/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch b/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch
index 936623496..38f6aa76a 100644
--- a/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch
+++ b/patches/chromium/0022-Adjust-gyp-defines-for-eLinux.patch
@@ -48,11 +48,11 @@ index 407d49d..b5af9d7 100644
'conditions': [
['chromeos==1', {
'sources/': [ ['include', '_chromeos\\.cc$'] ]
-diff --git a/base/base.gypi b/base/base.gypi
-index 11edab0..26aacaf 100644
---- a/base/base.gypi
-+++ b/base/base.gypi
-@@ -722,6 +722,13 @@
+diff --git a/chromium/base/base.gypi b/chromium/base/base.gypi
+index 11edab0..45d7180 100644
+--- a/chromium/base/base.gypi
++++ b/chromium/base/base.gypi
+@@ -722,6 +722,18 @@
'atomicops_internals_x86_gcc.cc',
],
}],
@@ -63,6 +63,11 @@ index 11edab0..26aacaf 100644
+ ['include', '^nix/'],
+ ],
+ }],
++ ['use_qt==1 and target_arch=="ia32"', {
++ 'sources/': [
++ ['include', 'atomicops_internals_x86_gcc.cc'],
++ ],
++ }],
['<(use_glib)==0 or >(nacl_untrusted_build)==1', {
'sources!': [
'message_loop/message_pump_glib.cc',