summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch34
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.16.1.bb1
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
new file mode 100644
index 0000000000..12836f28f2
--- /dev/null
+++ b/meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch
@@ -0,0 +1,34 @@
1Taken from
2https://bugs.webkit.org/show_bug.cgi?id=161900
3
4Upstream-Status: Pending
5Signed-off-by: Khem Raj <raj.khem@gmail.com>
6
7Index: webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt
8===================================================================
9--- webkitgtk-2.16.1.orig/Source/WTF/wtf/CMakeLists.txt
10+++ webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt
11@@ -182,7 +182,6 @@ set(WTF_HEADERS
12
13 set(WTF_SOURCES
14 Assertions.cpp
15- Atomics.cpp
16 AutomaticThread.cpp
17 BitVector.cpp
18 ClockType.cpp
19@@ -301,6 +300,15 @@ if (NOT USE_SYSTEM_MALLOC)
20 list(APPEND WTF_LIBRARIES bmalloc)
21 endif ()
22
23+file(WRITE ${CMAKE_BINARY_DIR}/test_atomics.cpp
24+ "int main(void)\n"
25+ "{ long long x = 1; return (int) __sync_add_and_fetch_8(&x, 1); }\n")
26+try_compile(ATOMICS_BUILD_SUCCEEDED ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/test_atomics.cpp)
27+if (NOT ATOMICS_BUILD_SUCCEEDED)
28+ list(APPEND WTF_SOURCES Atomics.cpp)
29+endif ()
30+file(REMOVE ${CMAKE_BINARY_DIR}/test_atomics.cpp)
31+
32 list(APPEND WTF_SOURCES
33 unicode/icu/CollatorICU.cpp
34 )
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.16.1.bb b/meta/recipes-sato/webkit/webkitgtk_2.16.1.bb
index 0931a50636..a52d93cfbe 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.16.1.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.16.1.bb
@@ -20,6 +20,7 @@ SRC_URI = "http://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
20 file://x32_support.patch \ 20 file://x32_support.patch \
21 file://cross-compile.patch \ 21 file://cross-compile.patch \
22 file://gcc7.patch \ 22 file://gcc7.patch \
23 file://detect-atomics-during-configure.patch \
23 " 24 "
24SRC_URI[md5sum] = "d3bcf995a667fd9febb9ab991acf0ca7" 25SRC_URI[md5sum] = "d3bcf995a667fd9febb9ab991acf0ca7"
25SRC_URI[sha256sum] = "eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed46769d2945" 26SRC_URI[sha256sum] = "eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed46769d2945"