diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 11:50:43 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 19:56:24 +0100 |
commit | f8c39026aa1510eaf62fcedc42bc687d6d8ad6ac (patch) | |
tree | e27355a2223ff85bf026d4063e9686b91f77c51b /recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch | |
parent | 4d4a34c5d29ef7b730eb9da87b39f91352ef66fa (diff) | |
download | meta-qt5-f8c39026aa1510eaf62fcedc42bc687d6d8ad6ac.tar.gz |
qtwebengine: refresh patches
* drop 0001-eLinux-build-ffmpegsumo-as-well.patch which is already included in 5.4.1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch')
-rw-r--r-- | recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch new file mode 100644 index 00000000..b4a8852e --- /dev/null +++ b/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 21d008c31a262ddcaeb3a8457de49061361ed882 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Fri, 3 Oct 2014 03:52:11 +0200 | ||
4 | Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc | ||
5 | when building for x64 arch | ||
6 | |||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
8 | --- | ||
9 | chromium/base/base.gypi | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi | ||
13 | index a5a990a..af30cfa 100644 | ||
14 | --- a/src/3rdparty/chromium/base/base.gypi | ||
15 | +++ b/src/3rdparty/chromium/base/base.gypi | ||
16 | @@ -745,7 +745,7 @@ | ||
17 | ['include', '^nix/'], | ||
18 | ], | ||
19 | }], | ||
20 | - ['use_qt==1 and target_arch=="ia32"', { | ||
21 | + ['use_qt==1 and target_arch=="ia32" or target_arch=="x64"', { | ||
22 | 'sources/': [ | ||
23 | ['include', 'atomicops_internals_x86_gcc.cc'], | ||
24 | ], | ||
25 | -- | ||
26 | 2.3.1 | ||
27 | |||