1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00

games/0ad: Fix build with clang 19

This commit is contained in:
Guido Falsi 2024-10-29 22:14:00 +01:00
parent 16c56fb628
commit d8eeb07e62
2 changed files with 17 additions and 1 deletions

View File

@ -0,0 +1,14 @@
--- libraries/source/spidermonkey/FixExclusiveDataClang19.diff.orig 2024-10-26 16:30:56 UTC
+++ libraries/source/spidermonkey/FixExclusiveDataClang19.diff
@@ -0,0 +1,11 @@
+--- a/js/src/threading/ExclusiveData.h.orig 2020-11-28 17:33:56.000000000 +0100
++++ b/js/src/threading/ExclusiveData.h
+@@ -110,7 +110,7 @@
+ : lock_(id), value_(std::forward<Args>(args)...) {}
+
+ ExclusiveData(ExclusiveData&& rhs)
+- : lock_(std::move(rhs.lock)), value_(std::move(rhs.value_)) {
++ : lock_(std::move(rhs.lock())), value_(std::move(rhs.value_)) {
+ MOZ_ASSERT(&rhs != this, "self-move disallowed!");
+ }
+

View File

@ -1,9 +1,11 @@
--- libraries/source/spidermonkey/patch.sh.orig 2022-09-23 20:36:41 UTC
+++ libraries/source/spidermonkey/patch.sh
@@ -84,4 +84,6 @@ then
@@ -84,4 +84,8 @@ then
patch -p1 < ../FixFreeBSDCargoChecksum.diff
# https://svnweb.freebsd.org/ports/head/lang/spidermonkey78/files/patch-third__party_rust_cc_src_lib.rs?view=log
patch -p1 < ../FixFreeBSDRustThirdPartyOSDetection.diff
+ # Remove now unknown compiler option causing problems
+ patch -p1 < ../FixFreeBSDClang16.diff
+ # Fix with clang19
+ patch -p1 < ../FixExclusiveDataClang19.diff
fi