diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2022-02-17 17:09:18 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-17 17:56:52 +0000 |
| commit | 389ac5f324d231525776456a64c5aaf32a6a4858 (patch) | |
| tree | 2bad6471f4ed470f7cdf4aec54ce31ef90cf84a5 /meta/recipes-sato | |
| parent | 550be77683805f2853a49cfe79584e9bf925f53d (diff) | |
| download | openembedded-core-389ac5f324d231525776456a64c5aaf32a6a4858.tar.gz | |
webkitgtk: remove rejected patch
Upstream has first accepted, then reverted this change,
so this needs to be re-submitted, after verifying that it is
still relevant.
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | 42 | ||||
| -rw-r--r-- | meta/recipes-sato/webkit/webkitgtk_2.34.5.bb | 1 |
2 files changed, 0 insertions, 43 deletions
diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch deleted file mode 100644 index a65cfc8b5a..0000000000 --- a/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b055bd199f9c40148334725a227796c0d7d14788 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 3 Feb 2020 17:06:27 -0800 -Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG - -Fixes build failures on risv64 - -Taken from https://trac.webkit.org/changeset/231843/webkit - - Enable THREADS_PREFER_PTHREAD_FLAG. This uses -pthread instead of --lpthread, fixing the 64-bit RISC-V build of the GTK+ port due to -missing atomic primitives. - -Upstream-Status: Submitted [https://trac.webkit.org/changeset/231843/webkit] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - Source/cmake/OptionsGTK.cmake | 1 + - Source/cmake/OptionsJSCOnly.cmake | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake -index 3cb5a495..dfba9900 100644 ---- a/Source/cmake/OptionsGTK.cmake -+++ b/Source/cmake/OptionsGTK.cmake -@@ -7,6 +7,7 @@ SET_PROJECT_VERSION(2 34 0) - - - set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") -+set(THREADS_PREFER_PTHREAD_FLAG ON) - - find_package(Cairo 1.14.0 REQUIRED) - find_package(Fontconfig 2.8.0 REQUIRED) -diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake -index e892b427..73bf9e4d 100644 ---- a/Source/cmake/OptionsJSCOnly.cmake -+++ b/Source/cmake/OptionsJSCOnly.cmake -@@ -1,3 +1,4 @@ -+set(THREADS_PREFER_PTHREAD_FLAG ON) - find_package(Threads REQUIRED) - - if (MSVC) diff --git a/meta/recipes-sato/webkit/webkitgtk_2.34.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.34.5.bb index e6362bedc3..41ecb8095a 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.34.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.34.5.bb @@ -14,7 +14,6 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-When-building-introspection-files-add-CMAKE_C_FLAGS-.patch \ 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-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \ file://reduce-memory-overheads.patch \ file://0001-Fix-build-without-opengl-or-es.patch \ file://reproducibility.patch \ |