diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-02-03 17:45:36 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-02-05 12:00:34 +0000 |
commit | 210daa5ea77ec716bb77aba9d5554b92bd114028 (patch) | |
tree | da83b5544e6abd70b7710d7b1267298e1b4dce94 /meta/recipes-sato/webkit/webkitgtk | |
parent | b486903ccc2070d365c21caae5bbfee8d765c5a0 (diff) | |
download | poky-210daa5ea77ec716bb77aba9d5554b92bd114028.tar.gz |
webkitgtk: Prefer -pthread over -lpthread
-pthread is compiler driver option which links in needed dependencies
for pthreads along with -lpthread, this aids in fixing build failures
on rv64
(From OE-Core rev: 94446ea1bfcb175af6fcaf5969a3a4507fdbf470)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato/webkit/webkitgtk')
-rw-r--r-- | meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | 45 |
1 files changed, 45 insertions, 0 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 new file mode 100644 index 0000000000..268118b5ca --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch | |||
@@ -0,0 +1,45 @@ | |||
1 | From 8ee7806ad2d5606967f7a1529a113fb9d1a386de Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 3 Feb 2020 17:06:27 -0800 | ||
4 | Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG | ||
5 | |||
6 | Fixes build failures on risv64 | ||
7 | |||
8 | Taken from https://trac.webkit.org/changeset/231843/webkit | ||
9 | |||
10 | Enable THREADS_PREFER_PTHREAD_FLAG. This uses -pthread instead of | ||
11 | -lpthread, fixing the 64-bit RISC-V build of the GTK+ port due to | ||
12 | missing atomic primitives. | ||
13 | |||
14 | Upstream-Status: Submitted [https://trac.webkit.org/changeset/231843/webkit] | ||
15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
16 | --- | ||
17 | Source/cmake/OptionsGTK.cmake | 2 ++ | ||
18 | Source/cmake/OptionsJSCOnly.cmake | 1 + | ||
19 | 2 files changed, 3 insertions(+) | ||
20 | |||
21 | diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake | ||
22 | index d3beef19..6a92856f 100644 | ||
23 | --- a/Source/cmake/OptionsGTK.cmake | ||
24 | +++ b/Source/cmake/OptionsGTK.cmake | ||
25 | @@ -17,6 +17,8 @@ set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/webkitgtk-${WEBKIT | ||
26 | set(INTROSPECTION_INSTALL_GIRDIR "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0") | ||
27 | set(INTROSPECTION_INSTALL_TYPELIBDIR "${LIB_INSTALL_DIR}/girepository-1.0") | ||
28 | |||
29 | +set(THREADS_PREFER_PTHREAD_FLAG ON) | ||
30 | + | ||
31 | find_package(Cairo 1.14.0 REQUIRED) | ||
32 | find_package(Fontconfig 2.8.0 REQUIRED) | ||
33 | find_package(Freetype 2.4.2 REQUIRED) | ||
34 | diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake | ||
35 | index b2e87418..326ade23 100644 | ||
36 | --- a/Source/cmake/OptionsJSCOnly.cmake | ||
37 | +++ b/Source/cmake/OptionsJSCOnly.cmake | ||
38 | @@ -1,3 +1,4 @@ | ||
39 | +set(THREADS_PREFER_PTHREAD_FLAG ON) | ||
40 | find_package(Threads REQUIRED) | ||
41 | |||
42 | if (MSVC) | ||
43 | -- | ||
44 | 2.25.0 | ||
45 | |||