git: fd91b46c0272 - main - games/0ad: Fix build with clang 16
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 28 Jun 2023 20:45:52 UTC
The branch main has been updated by madpilot:
URL: https://cgit.FreeBSD.org/ports/commit/?id=fd91b46c02729f5c22df95a0ccc85fd1667d8c49
commit fd91b46c02729f5c22df95a0ccc85fd1667d8c49
Author: Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2023-06-28 20:44:55 +0000
Commit: Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2023-06-28 20:44:55 +0000
games/0ad: Fix build with clang 16
---
...libraries_source_spidermonkey_FixFreeBSDClang16.diff | 17 +++++++++++++++++
.../files/patch-libraries_source_spidermonkey_patch.sh | 9 +++++++++
2 files changed, 26 insertions(+)
diff --git a/games/0ad/files/patch-libraries_source_spidermonkey_FixFreeBSDClang16.diff b/games/0ad/files/patch-libraries_source_spidermonkey_FixFreeBSDClang16.diff
new file mode 100644
index 000000000000..2a4bc9cc5819
--- /dev/null
+++ b/games/0ad/files/patch-libraries_source_spidermonkey_FixFreeBSDClang16.diff
@@ -0,0 +1,17 @@
+--- libraries/source/spidermonkey/FixFreeBSDClang16.diff.orig 2023-06-28 15:31:44 UTC
++++ libraries/source/spidermonkey/FixFreeBSDClang16.diff
+@@ -0,0 +1,14 @@
++diff -ruN a/build/moz.configure/flags.configure b/build/moz.configure/flags.configure
++--- a/build/moz.configure/flags.configure 2020-11-28 17:33:01.000000000 +0100
+++++ b/build/moz.configure/flags.configure
++@@ -56,10 +56,5 @@
++ # Temporary until https://bugs.llvm.org/show_bug.cgi?id=45835 gets a
++ # real fix: clang 10 hangs with some ubsan-inserted code constructs.
++ return None
++- if enabled and compiler.version >= '9.0.0':
++- if compiler.type == 'clang':
++- return ['-fexperimental-new-pass-manager']
++- elif compiler.type == 'clang-cl':
++- return ['-Xclang', '-fexperimental-new-pass-manager']
++
++ set_config('MOZ_NEW_PASS_MANAGER_FLAGS', new_pass_manager_flags)
diff --git a/games/0ad/files/patch-libraries_source_spidermonkey_patch.sh b/games/0ad/files/patch-libraries_source_spidermonkey_patch.sh
new file mode 100644
index 000000000000..f4e6b93e4f35
--- /dev/null
+++ b/games/0ad/files/patch-libraries_source_spidermonkey_patch.sh
@@ -0,0 +1,9 @@
+--- libraries/source/spidermonkey/patch.sh.orig 2022-09-23 20:36:41 UTC
++++ libraries/source/spidermonkey/patch.sh
+@@ -84,4 +84,6 @@ 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
+ fi