Date: Tue, 29 Oct 2024 21:14:32 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d8eeb07e62ca - main - games/0ad: Fix build with clang 19 Message-ID: <202410292114.49TLEWXg097155@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=d8eeb07e62ca8547db889557610f1fc543542348 commit d8eeb07e62ca8547db889557610f1fc543542348 Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2024-10-29 21:14:00 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2024-10-29 21:14:00 +0000 games/0ad: Fix build with clang 19 --- ...raries_source_spidermonkey_FixExclusiveDataClang19.diff | 14 ++++++++++++++ .../0ad/files/patch-libraries_source_spidermonkey_patch.sh | 4 +++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/games/0ad/files/patch-libraries_source_spidermonkey_FixExclusiveDataClang19.diff b/games/0ad/files/patch-libraries_source_spidermonkey_FixExclusiveDataClang19.diff new file mode 100644 index 000000000000..1259aec79061 --- /dev/null +++ b/games/0ad/files/patch-libraries_source_spidermonkey_FixExclusiveDataClang19.diff @@ -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!"); ++ } ++ diff --git a/games/0ad/files/patch-libraries_source_spidermonkey_patch.sh b/games/0ad/files/patch-libraries_source_spidermonkey_patch.sh index f4e6b93e4f35..1483f03d6ab0 100644 --- a/games/0ad/files/patch-libraries_source_spidermonkey_patch.sh +++ b/games/0ad/files/patch-libraries_source_spidermonkey_patch.sh @@ -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 fihome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202410292114.49TLEWXg097155>