diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-12-11 18:23:52 +0100 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2015-01-09 08:46:26 -0800 |
| commit | fb4f7047268db75f15d5aba30ad07903e329760f (patch) | |
| tree | 0f6e0b4c997b325016c6a19573bfed8a995bf0cc /meta-qt5/recipes-qt | |
| parent | 4ef7769957dfd2099aa7bd34dbfd9faadde555b8 (diff) | |
| download | tizen-distro-fb4f7047268db75f15d5aba30ad07903e329760f.tar.gz tizen-distro-fb4f7047268db75f15d5aba30ad07903e329760f.tar.bz2 tizen-distro-fb4f7047268db75f15d5aba30ad07903e329760f.zip | |
qtbwebengine: fix build for qemux86-64
* it was applied only for qtwebengine_5.3.2+git.bb, then removed
completely with 5.4.0 upgrade, but it's still needed for both
versions
(From meta-qt5 rev: 8d9a1b8b61630bc14862d4862d1340059d6f9c16)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Diffstat (limited to 'meta-qt5/recipes-qt')
3 files changed, 29 insertions, 0 deletions
diff --git a/meta-qt5/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch b/meta-qt5/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch new file mode 100644 index 0000000000..032fe4decc --- /dev/null +++ b/meta-qt5/recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch @@ -0,0 +1,27 @@ +From 41b142ec46c61d075b5cd95a88b57f0db74cbf31 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.3 + diff --git a/meta-qt5/recipes-qt/qt5/qtwebengine_5.4.0.bb b/meta-qt5/recipes-qt/qt5/qtwebengine_5.4.0.bb index 85ac3979ae..e74a7397ba 100644 --- a/meta-qt5/recipes-qt/qt5/qtwebengine_5.4.0.bb +++ b/meta-qt5/recipes-qt/qt5/qtwebengine_5.4.0.bb @@ -8,4 +8,5 @@ SRC_URI += " \ file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ + file://0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch \ " diff --git a/meta-qt5/recipes-qt/qt5/qtwebengine_git.bb b/meta-qt5/recipes-qt/qt5/qtwebengine_git.bb index 31467cb9e3..2f10e131f8 100644 --- a/meta-qt5/recipes-qt/qt5/qtwebengine_git.bb +++ b/meta-qt5/recipes-qt/qt5/qtwebengine_git.bb @@ -9,6 +9,7 @@ SRC_URI += " \ file://0001-functions.prf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch \ file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \ file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \ + file://0001-chromium-base.gypi-include-atomicops_internals_x86_gcc.cc-whe.patch \ " SRCREV_qtwebengine = "8eefc3a0658d1b10de12f43534cfd63af825ebc8" SRCREV_chromium = "be4ec3fa64a4c6c2b641830a9811ab7847c7dd39" |