diff options
| author | Khem Raj <raj.khem@gmail.com> | 2016-12-18 22:39:48 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-19 15:03:43 +0000 |
| commit | a77fc49defcf3a30a8f026cfdbd56565750f5a61 (patch) | |
| tree | 18e13a31aa710c147191f664f2bfb4441f81211e /meta/recipes-sato/webkit | |
| parent | 59338b0bc2f8a5fe929d906769f5518ec67d6f3f (diff) | |
| download | openembedded-core-a77fc49defcf3a30a8f026cfdbd56565750f5a61.tar.gz openembedded-core-a77fc49defcf3a30a8f026cfdbd56565750f5a61.tar.bz2 openembedded-core-a77fc49defcf3a30a8f026cfdbd56565750f5a61.zip | |
webkitgtk: Fix atomic detection on arm architecture
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta/recipes-sato/webkit')
| -rw-r--r-- | meta/recipes-sato/webkit/files/detect_atomics.patch | 38 | ||||
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.14.2.bb | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/files/detect_atomics.patch b/meta/recipes-sato/webkit/files/detect_atomics.patch new file mode 100644 index 0000000000..c4e80a7d96 --- /dev/null +++ b/meta/recipes-sato/webkit/files/detect_atomics.patch @@ -0,0 +1,38 @@ +Sourced from https://bugs.webkit.org/show_bug.cgi?id=161900 + +on arm fixes + +| /usr/src/debug/libgcc/6.2.0-r0/gcc-6.2.0/build.arm-oe-linux-gnueabi.arm-oe-linux-gnueabi/libgcc/../../../../../../../work-shared/gcc-6.2.0-r0/gcc-6.2.0/libgcc/config/arm/linux-atomic-64bit.c:117: multiple definition of `__sync_sub_and_fetch_8' + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Upstream-Status: Backport + +diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt +index 867999e..ea69322 100644 +--- a/Source/WTF/wtf/CMakeLists.txt ++++ b/Source/WTF/wtf/CMakeLists.txt +@@ -171,7 +171,6 @@ set(WTF_HEADERS + + set(WTF_SOURCES + Assertions.cpp +- Atomics.cpp + BitVector.cpp + CompilationThread.cpp + CrossThreadCopier.cpp +@@ -276,6 +275,15 @@ if (NOT USE_SYSTEM_MALLOC) + list(APPEND WTF_LIBRARIES bmalloc) + endif () + ++file(WRITE ${CMAKE_BINARY_DIR}/test_atomics.cpp ++ "int main(void)\n" ++ "{ long long x = 1; return (int) __sync_add_and_fetch_8(&x, 1); }\n") ++try_compile(ATOMICS_BUILD_SUCCEEDED ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/test_atomics.cpp) ++if (NOT ATOMICS_BUILD_SUCCEEDED) ++ list(APPEND WTF_SOURCES Atomics.cpp) ++endif () ++file(REMOVE ${CMAKE_BINARY_DIR}/test_atomics.cpp) ++ + list(APPEND WTF_SOURCES + unicode/icu/CollatorICU.cpp + ) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.14.2.bb b/meta/recipes-sato/webkit/webkitgtk_2.14.2.bb index 1c327babfb..46b54683fb 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.14.2.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.14.2.bb @@ -19,6 +19,7 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.patch \ file://0001-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \ file://0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch \ + file://detect_atomics.patch \ " SRC_URI[md5sum] = "2fe3cadbc546d93ca68a13756c2be015" |