diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2017-05-17 22:34:24 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-25 23:35:50 +0100 |
| commit | 424ffbde2111130137e307eb9e598ad50451c865 (patch) | |
| tree | ae78a59fc45356608f4d8b16109bf73e2241ee77 /meta/recipes-sato | |
| parent | 5d3df78367be0afbfe001b4fa776a98a82e6ce54 (diff) | |
| download | openembedded-core-contrib-424ffbde2111130137e307eb9e598ad50451c865.tar.gz | |
webkitgtk: Fix build for armv5
Detect atomics during configure
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-sato')
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/detect-atomics-during-configure.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.16.1.bb | 1 |
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 @@ +Taken from +https://bugs.webkit.org/show_bug.cgi?id=161900 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt +=================================================================== +--- webkitgtk-2.16.1.orig/Source/WTF/wtf/CMakeLists.txt ++++ webkitgtk-2.16.1/Source/WTF/wtf/CMakeLists.txt +@@ -182,7 +182,6 @@ set(WTF_HEADERS + + set(WTF_SOURCES + Assertions.cpp +- Atomics.cpp + AutomaticThread.cpp + BitVector.cpp + ClockType.cpp +@@ -301,6 +300,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.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 \ file://x32_support.patch \ file://cross-compile.patch \ file://gcc7.patch \ + file://detect-atomics-during-configure.patch \ " SRC_URI[md5sum] = "d3bcf995a667fd9febb9ab991acf0ca7" SRC_URI[sha256sum] = "eb92383232328ce655b703c64370ed3795662479719ad1b4a869ed46769d2945" |