blob: a65cfc8b5a41e2736255c68fadd912e8b4209d07 [file] [log] [blame]
Andrew Geisslereff27472021-10-29 15:35:00 -05001From b055bd199f9c40148334725a227796c0d7d14788 Mon Sep 17 00:00:00 2001
Andrew Geissler82c905d2020-04-13 13:39:40 -05002From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 3 Feb 2020 17:06:27 -0800
4Subject: [PATCH] Enable THREADS_PREFER_PTHREAD_FLAG
5
6Fixes build failures on risv64
7
8Taken 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
12missing atomic primitives.
13
14Upstream-Status: Submitted [https://trac.webkit.org/changeset/231843/webkit]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
Andrew Geissler6ce62a22020-11-30 19:58:47 -060016
Andrew Geissler82c905d2020-04-13 13:39:40 -050017---
Andrew Geissler6ce62a22020-11-30 19:58:47 -060018 Source/cmake/OptionsGTK.cmake | 1 +
Andrew Geissler82c905d2020-04-13 13:39:40 -050019 Source/cmake/OptionsJSCOnly.cmake | 1 +
Andrew Geissler6ce62a22020-11-30 19:58:47 -060020 2 files changed, 2 insertions(+)
Andrew Geissler82c905d2020-04-13 13:39:40 -050021
22diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
Andrew Geisslereff27472021-10-29 15:35:00 -050023index 3cb5a495..dfba9900 100644
Andrew Geissler82c905d2020-04-13 13:39:40 -050024--- a/Source/cmake/OptionsGTK.cmake
25+++ b/Source/cmake/OptionsGTK.cmake
Andrew Geisslereff27472021-10-29 15:35:00 -050026@@ -7,6 +7,7 @@ SET_PROJECT_VERSION(2 34 0)
27
William A. Kennington IIIac69b482021-06-02 12:28:27 -070028
29 set(USER_AGENT_BRANDING "" CACHE STRING "Branding to add to user agent string")
Andrew Geissler82c905d2020-04-13 13:39:40 -050030+set(THREADS_PREFER_PTHREAD_FLAG ON)
Andrew Geissler6ce62a22020-11-30 19:58:47 -060031
Andrew Geissler82c905d2020-04-13 13:39:40 -050032 find_package(Cairo 1.14.0 REQUIRED)
33 find_package(Fontconfig 2.8.0 REQUIRED)
Andrew Geissler82c905d2020-04-13 13:39:40 -050034diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake
Andrew Geisslereff27472021-10-29 15:35:00 -050035index e892b427..73bf9e4d 100644
Andrew Geissler82c905d2020-04-13 13:39:40 -050036--- 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)