Skip to content

Commit

Permalink
lang/spidermonkey78: Fix build with llvm16
Browse files Browse the repository at this point in the history
- Refresh patches

Sponsored by:	The FreeBSD Foundation
  • Loading branch information
5u623l20 committed Jun 24, 2023
1 parent 2d9edc4 commit 60ef64a
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
@@ -0,0 +1,11 @@
--- build/moz.configure/flags.configure.orig 2023-06-24 10:37:11 UTC
+++ build/moz.configure/flags.configure
@@ -56,7 +56,7 @@ def new_pass_manager_flags(enabled, compiler, host, ta
# 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 enabled and compiler.version >= '9.0.0' and compiler.version < '16.0.0':
if compiler.type == 'clang':
return ['-fexperimental-new-pass-manager']
elif compiler.type == 'clang-cl':
11 changes: 10 additions & 1 deletion lang/spidermonkey78/files/patch-python_mozbuild_mozbuild_util.py
@@ -1,4 +1,4 @@
--- python/mozbuild/mozbuild/util.py.orig 2021-03-15 15:52:38 UTC
--- python/mozbuild/mozbuild/util.py.orig 2021-09-28 10:04:57 UTC
+++ python/mozbuild/mozbuild/util.py
@@ -27,6 +27,11 @@ from collections import (
)
Expand All @@ -12,6 +12,15 @@
import six

if sys.platform == 'win32':
@@ -220,7 +225,7 @@ class FileAvoidWrite(BytesIO):
still occur, as well as diff capture if requested.
"""

- def __init__(self, filename, capture_diff=False, dry_run=False, readmode='rU'):
+ def __init__(self, filename, capture_diff=False, dry_run=False, readmode='r'):
BytesIO.__init__(self)
self.name = filename
assert type(capture_diff) == bool
@@ -782,7 +787,7 @@ class HierarchicalStringList(object):
self._strings = StrictOrderingOnAppendList()
self._children = {}
Expand Down

0 comments on commit 60ef64a

Please sign in to comment.