diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-04 04:21:10 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-04 04:23:52 +0200 |
| commit | 3700c51c246f6aaf8ef6a3ce098578664873c096 (patch) | |
| tree | 2efff1e0ad638cee86b94d64bc99c6bc77eb7cc0 | |
| parent | c524da4747607a770bdef7ed6773bc1c1e48f346 (diff) | |
qtbwebengine: fix build for qemux86-64
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtwebengine/0003-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch | 27 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtwebengine_git.bb | 1 |
2 files changed, 28 insertions, 0 deletions
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 00000000..1cf12424 --- /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 08486df2..dd93d1f0 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" |