diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-11 10:20:35 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-12 10:25:33 +0200 |
commit | c2768bd4e5dffb22126c0bd1f40638c9a74295fd (patch) | |
tree | 923b028b03e66b94079e40a760b8db3e781ad95b /recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch | |
parent | 00d72cd892b2c7edb3c0c158f0f2f5f5ecd41887 (diff) | |
download | meta-qt5-c2768bd4e5dffb22126c0bd1f40638c9a74295fd.tar.gz |
qtwebengine: fix build with gcc7
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 | 21 |
1 files changed, 12 insertions, 9 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 index ccd43e21..44901165 100644 --- 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 | |||
@@ -1,19 +1,19 @@ | |||
1 | From db56cd0fd185a9f3858f5aa6e95b24e63dee119f Mon Sep 17 00:00:00 2001 | 1 | From 83eee1ff5f9259595b8630e464fa869c6fde8f3c Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Fri, 3 Oct 2014 03:52:11 +0200 | 3 | Date: Fri, 3 Oct 2014 03:52:11 +0200 |
4 | Subject: [PATCH] <chromium> base.gypi: include atomicops_internals_x86_gcc.cc | 4 | Subject: [PATCH 1/4] <chromium> base.gypi: include |
5 | when building for x64 arch | 5 | atomicops_internals_x86_gcc.cc when building for x64 arch |
6 | 6 | ||
7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 7 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
8 | --- | 8 | --- |
9 | src/3rdparty/chromium/base/base.gypi | 2 +- | 9 | chromium/base/base.gypi | 2 +- |
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | 10 | 1 file changed, 1 insertion(+), 1 deletion(-) |
11 | 11 | ||
12 | diff --git a/src/3rdparty/chromium/base/base.gypi b/src/3rdparty/chromium/base/base.gypi | 12 | diff --git a/chromium/base/base.gypi b/chromium/base/base.gypi |
13 | index 63c3f76..331c975 100644 | 13 | index a4da596070..13173d621e 100644 |
14 | --- a/src/3rdparty/chromium/base/base.gypi | 14 | --- a/chromium/base/base.gypi |
15 | +++ b/src/3rdparty/chromium/base/base.gypi | 15 | +++ b/chromium/base/base.gypi |
16 | @@ -801,7 +801,7 @@ | 16 | @@ -845,7 +845,7 @@ |
17 | ['include', '^nix/'], | 17 | ['include', '^nix/'], |
18 | ], | 18 | ], |
19 | }], | 19 | }], |
@@ -22,3 +22,6 @@ index 63c3f76..331c975 100644 | |||
22 | 'sources/': [ | 22 | 'sources/': [ |
23 | ['include', 'atomicops_internals_x86_gcc.cc'], | 23 | ['include', 'atomicops_internals_x86_gcc.cc'], |
24 | ], | 24 | ], |
25 | -- | ||
26 | 2.13.2 | ||
27 | |||