diff options
3 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-sato/webkit/files/0001-ANGLE-Remove-static_assert-for-64bit-atomics.patch b/meta/recipes-sato/webkit/files/0001-ANGLE-Remove-static_assert-for-64bit-atomics.patch new file mode 100644 index 00000000000..d39eee6c58c --- /dev/null +++ b/meta/recipes-sato/webkit/files/0001-ANGLE-Remove-static_assert-for-64bit-atomics.patch @@ -0,0 +1,33 @@ +From 03d5f84e7bb292f5cf7120af91e979fc87b36e04 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 28 Mar 2023 14:38:17 -0700 +Subject: [PATCH] ANGLE: Remove static_assert for 64bit atomics + +This will make sure that it can be built on 32bit platforms e.g. +mips32/ppc32 + +This partially reverts https://chromium-review.googlesource.com/c/angle/angle/+/4205892 +the suggestion to remove the assertion is from the author of the patch +itself + +Upstream-Status: Inappropriate [32-bit specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Source/ThirdParty/ANGLE/src/libANGLE/renderer/serial_utils.h | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/serial_utils.h b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/serial_utils.h +index 51ad1af9..9412c805 100644 +--- a/Source/ThirdParty/ANGLE/src/libANGLE/renderer/serial_utils.h ++++ b/Source/ThirdParty/ANGLE/src/libANGLE/renderer/serial_utils.h +@@ -129,7 +129,6 @@ class AtomicQueueSerial final + private: + static constexpr uint64_t kInvalid = 0; + std::atomic<uint64_t> mValue = kInvalid; +- static_assert(decltype(mValue)::is_always_lock_free, "Must always be lock free"); + }; + + // Used as default/initial serial +-- +2.40.0 + diff --git a/meta/recipes-sato/webkit/webkitgtk-3_2.40.0.bb b/meta/recipes-sato/webkit/webkitgtk-3_2.40.0.bb index 13e3de3b797..ade215cfdae 100644 --- a/meta/recipes-sato/webkit/webkitgtk-3_2.40.0.bb +++ b/meta/recipes-sato/webkit/webkitgtk-3_2.40.0.bb @@ -15,6 +15,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ file://reproducibility.patch \ file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ file://disable_wasm_riscv64.patch \ + file://0001-ANGLE-Remove-static_assert-for-64bit-atomics.patch \ " SRC_URI[sha256sum] = "a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393" diff --git a/meta/recipes-sato/webkit/webkitgtk_2.40.0.bb b/meta/recipes-sato/webkit/webkitgtk_2.40.0.bb index 5f468539d0f..a9a264a231c 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.40.0.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.40.0.bb @@ -15,6 +15,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://reproducibility.patch \ file://0d3344e17d258106617b0e6d783d073b188a2548.patch \ file://disable_wasm_riscv64.patch \ + file://0001-ANGLE-Remove-static_assert-for-64bit-atomics.patch \ " SRC_URI[sha256sum] = "a4607ea1bf89669e89b1cb2c63faaec513f93de09b6ae60cc71d6a8aab7ab393" |