summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2023-10-18 13:15:00 +0300
committerMart Raudsepp <leio@gentoo.org>2023-10-18 23:15:40 +0300
commit99c12322922271f82e048cbb03d260aeee6997e5 (patch)
tree097aadbb3f56ba47aed4d04ed2ed5addee51a652 /net-libs
parentgui-libs/egl-wayland: drop 1.1.12 (diff)
downloadgentoo-99c12322922271f82e048cbb03d260aeee6997e5.tar.gz
gentoo-99c12322922271f82e048cbb03d260aeee6997e5.tar.bz2
gentoo-99c12322922271f82e048cbb03d260aeee6997e5.zip
net-libs/webkit-gtk: Fix USE=-jumbo-build compilation on arm64
Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/webkit-gtk/files/2.42.1-arm64-non-jumbo-fix.patch38
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild3
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild3
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild3
4 files changed, 47 insertions, 0 deletions
diff --git a/net-libs/webkit-gtk/files/2.42.1-arm64-non-jumbo-fix.patch b/net-libs/webkit-gtk/files/2.42.1-arm64-non-jumbo-fix.patch
new file mode 100644
index 000000000000..ec05d647d7f8
--- /dev/null
+++ b/net-libs/webkit-gtk/files/2.42.1-arm64-non-jumbo-fix.patch
@@ -0,0 +1,38 @@
+From c5e664167ec74b24a9082506fe17dee1ea194185 Mon Sep 17 00:00:00 2001
+From: Mart Raudsepp <leio@gentoo.org>
+Date: Wed, 18 Oct 2023 13:08:30 +0300
+Subject: [PATCH] [JSC] Fix Air OptimizePairedLoadStore missing header includes
+
+Reviewed by NOBODY (OOPS!).
+
+Fixes compile errors with non-unified build by adding missing include files for
+single unit compilation.
+Fixed compilation errors:
+
+error: incomplete type 'JSC::CCallHelpers' named in nested name specifier
+error: function 'JSC::B3::Air::Inst::forEachDefWithExtraClobberedRegs<JSC::B3::Air::Tmp, (lambda at ...)>' is used but not defined in this translation unit, and cannot be defined in any other translation unit because its type does not have linkage
+
+* Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp
+---
+ Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+https://github.com/WebKit/WebKit/pull/19242
+
+diff --git a/Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp b/Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp
+index e6fc4d116d00..8321ba03822a 100644
+--- a/Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp
++++ b/Source/JavaScriptCore/b3/air/AirOptimizePairedLoadStore.cpp
+@@ -32,7 +32,9 @@
+ #include "AirArgInlines.h"
+ #include "AirCode.h"
+ #include "AirInst.h"
++#include "AirInstInlines.h"
+ #include "AirPhaseScope.h"
++#include "CCallHelpers.h"
+ #include <wtf/Range.h>
+
+ namespace JSC { namespace B3 { namespace Air {
+--
+2.42.0
+
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
index 007034b448c5..19c7f97e3817 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r410.ebuild
@@ -150,6 +150,9 @@ pkg_setup() {
src_prepare() {
cmake_src_prepare
gnome2_src_prepare
+
+ # Fix USE=-jumbo-build compilation on arm64
+ eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
}
src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
index c3f8c3afb610..750b51413093 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1-r600.ebuild
@@ -151,6 +151,9 @@ pkg_setup() {
src_prepare() {
cmake_src_prepare
gnome2_src_prepare
+
+ # Fix USE=-jumbo-build compilation on arm64
+ eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
}
src_configure() {
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
index ff1b87b91e12..86bbd5c5de8a 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.42.1.ebuild
@@ -148,6 +148,9 @@ pkg_setup() {
src_prepare() {
cmake_src_prepare
gnome2_src_prepare
+
+ # Fix USE=-jumbo-build compilation on arm64
+ eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch
}
src_configure() {