mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
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>
This commit is contained in:
@@ -0,0 +1,45 @@
|
|||||||
|
From 8ee7806ad2d5606967f7a1529a113fb9d1a386de 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 | 2 ++
|
||||||
|
Source/cmake/OptionsJSCOnly.cmake | 1 +
|
||||||
|
2 files changed, 3 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
|
||||||
|
index d3beef19..6a92856f 100644
|
||||||
|
--- a/Source/cmake/OptionsGTK.cmake
|
||||||
|
+++ b/Source/cmake/OptionsGTK.cmake
|
||||||
|
@@ -17,6 +17,8 @@ set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/webkitgtk-${WEBKIT
|
||||||
|
set(INTROSPECTION_INSTALL_GIRDIR "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0")
|
||||||
|
set(INTROSPECTION_INSTALL_TYPELIBDIR "${LIB_INSTALL_DIR}/girepository-1.0")
|
||||||
|
|
||||||
|
+set(THREADS_PREFER_PTHREAD_FLAG ON)
|
||||||
|
+
|
||||||
|
find_package(Cairo 1.14.0 REQUIRED)
|
||||||
|
find_package(Fontconfig 2.8.0 REQUIRED)
|
||||||
|
find_package(Freetype 2.4.2 REQUIRED)
|
||||||
|
diff --git a/Source/cmake/OptionsJSCOnly.cmake b/Source/cmake/OptionsJSCOnly.cmake
|
||||||
|
index b2e87418..326ade23 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)
|
||||||
|
--
|
||||||
|
2.25.0
|
||||||
|
|
||||||
@@ -15,6 +15,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \
|
|||||||
file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \
|
file://0001-OptionsGTK.cmake-drop-the-hardcoded-introspection-gt.patch \
|
||||||
file://0001-Fix-racy-parallel-build-of-WebKit2-4.0.gir.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-Tweak-gtkdoc-settings-so-that-gtkdoc-generation-work.patch \
|
||||||
|
file://0001-Enable-THREADS_PREFER_PTHREAD_FLAG.patch \
|
||||||
file://x32_support.patch \
|
file://x32_support.patch \
|
||||||
file://cross-compile.patch \
|
file://cross-compile.patch \
|
||||||
file://0001-Fix-build-with-musl.patch \
|
file://0001-Fix-build-with-musl.patch \
|
||||||
|
|||||||
Reference in New Issue
Block a user