diff options
| author |   Branko Grubic <bitlord0xff@gmail.com> | 2024-03-05 19:06:51 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2024-03-21 02:45:09 +0000 |
| commit | 387a58172e3864aa412bd5bf8d108da784817255 (patch) | |
| tree | 8c26e4b804345fae3574c4952f873c3f31728b39 | |
| parent | media-video/mkvtoolnix: drop 72.0.0, 75.0.0, 80.0 (diff) | |
| download | gentoo-387a58172e3864aa412bd5bf8d108da784817255.tar.gz gentoo-387a58172e3864aa412bd5bf8d108da784817255.tar.bz2 gentoo-387a58172e3864aa412bd5bf8d108da784817255.zip | |
net-libs/webkit-gtk: Fixes ARM64 non-jumbo build
Closes: https://bugs.gentoo.org/925621
Signed-off-by: Branko Grubic <bitlord0xff@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35633
Signed-off-by: Sam James <sam@gentoo.org>
10 files changed, 38 insertions, 0 deletions
diff --git a/net-libs/webkit-gtk/files/2.42.3-arm64-non-jumbo-fix-925621.patch b/net-libs/webkit-gtk/files/2.42.3-arm64-non-jumbo-fix-925621.patch new file mode 100644 index 000000000000..51fc45fa32c4 --- /dev/null +++ b/net-libs/webkit-gtk/files/2.42.3-arm64-non-jumbo-fix-925621.patch @@ -0,0 +1,29 @@ +From 56001e951362a5064027b1af81283e523e35559b Mon Sep 17 00:00:00 2001 +From: Dennis Camera <dennis.camera+webkit@riiengineering.ch> +Date: Mon, 4 Mar 2024 09:27:54 -0800 +Subject: [PATCH] [JSC] A64DOpcode include <mutex> + https://bugs.webkit.org/show_bug.cgi?id=270394 + +Reviewed by Michael Catanzaro. + +When UNIFIED_BUILDS are disabled, the build fails due to missing std::call_once. + +* Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h: include <mutex>. + +Canonical link: https://commits.webkit.org/275630@main +--- + Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h b/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h +index 0392bcb6e20a0..202aa4d1d81de 100644 +--- a/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h ++++ b/Source/JavaScriptCore/disassembler/ARM64/A64DOpcode.h +@@ -25,6 +25,7 @@ + + #pragma once + ++#include <mutex> + #include <stdint.h> + #include <wtf/Assertions.h> + #include <wtf/DataLog.h> diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild index 67a6f3ef6fd2..e42873a09ccd 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r410.ebuild @@ -153,6 +153,7 @@ src_prepare() { # Fix USE=-jumbo-build compilation on arm64 eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild index 55fb6a6fc4ca..8e47bab09487 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3-r600.ebuild @@ -154,6 +154,7 @@ src_prepare() { # Fix USE=-jumbo-build compilation on arm64 eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild index c2dbd794b679..947457b3bc6d 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.42.3.ebuild @@ -151,6 +151,7 @@ src_prepare() { # Fix USE=-jumbo-build compilation on arm64 eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch } src_configure() { diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild index 68f473b5cc83..39b921345132 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r410.ebuild @@ -155,6 +155,7 @@ src_prepare() { # Fix USE=-jumbo-build compilation on arm64 eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch # Fix assert failure on some machines, bug #920704 eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch } diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild index 2d58a29cbfa2..71847398694a 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4-r600.ebuild @@ -156,6 +156,7 @@ src_prepare() { # Fix USE=-jumbo-build compilation on arm64 eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch # Fix assert failure on some machines, bug #920704 eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch } diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild index aa578715e450..0bd69d249c30 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.42.4.ebuild @@ -153,6 +153,7 @@ src_prepare() { # Fix USE=-jumbo-build compilation on arm64 eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch # Fix assert failure on some machines, bug #920704 eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch } diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild index 0f1a6bea0d66..38d773a9d41c 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r410.ebuild @@ -155,6 +155,7 @@ src_prepare() { # Fix USE=-jumbo-build compilation on arm64 eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch # Fix assert failure on some machines, bug #920704 eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch # Fix compilation on x86, bug #924873 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild index be33daab50ba..78f3686ffd25 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5-r600.ebuild @@ -156,6 +156,7 @@ src_prepare() { # Fix USE=-jumbo-build compilation on arm64 eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch # Fix assert failure on some machines, bug #920704 eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch # Fix compilation on x86, bug #924873 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild index 002acc94dddf..b2b5f75bcd7c 100644 --- a/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-2.42.5.ebuild @@ -153,6 +153,7 @@ src_prepare() { # Fix USE=-jumbo-build compilation on arm64 eapply "${FILESDIR}"/2.42.1-arm64-non-jumbo-fix.patch + eapply "${FILESDIR}"/2.42.3-arm64-non-jumbo-fix-925621.patch # Fix assert failure on some machines, bug #920704 eapply "${FILESDIR}"/2.42.4-wasm-assert-fix.patch # Fix compilation on x86, bug #924873 |