William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 1 | From af90ae1f128626e8d57a8bcbc432596bfc2987af Mon Sep 17 00:00:00 2001 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 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> |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 16 | |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 17 | --- |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 18 | Source/cmake/OptionsGTK.cmake | 1 + |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 19 | Source/cmake/OptionsJSCOnly.cmake | 1 + |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 20 | 2 files changed, 2 insertions(+) |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 21 | |
| 22 | diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 23 | index af6c0fac..f393d741 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 24 | --- a/Source/cmake/OptionsGTK.cmake |
| 25 | +++ b/Source/cmake/OptionsGTK.cmake |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 26 | @@ -6,6 +6,7 @@ WEBKIT_OPTION_BEGIN() |
| 27 | SET_PROJECT_VERSION(2 32 1) |
| 28 | |
| 29 | set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string") |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 30 | +set(THREADS_PREFER_PTHREAD_FLAG ON) |
Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 31 | |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 32 | find_package(Cairo 1.14.0 REQUIRED) |
| 33 | find_package(Fontconfig 2.8.0 REQUIRED) |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 34 | diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake |
William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame^] | 35 | index 10664400..d9aca95a 100644 |
Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 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) |