From nobody Sat Jun 24 10:59:01 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QpB1f0HnQz4hB01; Sat, 24 Jun 2023 10:59:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QpB1d5Ytrz3p7B; Sat, 24 Jun 2023 10:59:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687604341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1d+Evs4W93RbW1ud87K0VDF664e3uMkk2v6Qw/q3TlQ=; b=ke46uwyqiqLCHhPQsr//oT0T5ixA/J9QsWZQ8sRzLZ2K9gGYqqmQzyQrmoEYb7zws/TE5I EFUJAtKinwGbixpcwAVs5bEjE2/9VssHllh/kWw2HbayXp+llX7aJxh3VTaphiSaZIWx0X vYirOiD0ushzRQQcJ5jREPVs6NMlwCllJVQ+TLRVj8y89lCwQXT7raaQhiahpVhnqO8I7G p9jJipEZx9D57fQRJPl+CM1XBSsRaiu1WPPlcfqWALgAPNiJrJX4KWBhocjudX4hOj1T5K HZOCBs3gEPwun/0qLEgGkz2CjOULLPPRa2eaBX5Pw3+wniai5XKGE1dbiCzT+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687604341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1d+Evs4W93RbW1ud87K0VDF664e3uMkk2v6Qw/q3TlQ=; b=MS5kiQT/OLF2ZRfoiDbo52pQoATPHD+aPAsr2ERqtOcl9E/YC1BCz7EA0n+Fln6euwTm41 qVPc8QldvUc9f96++GsONsYR6qlqbDoEpHFElZMggJ3zdM03jfdKumpHdVtpuk3pPDjbWH 56sms358RcS/FGuvDi+xJmi13NZ9OQtJLyOFHl2TsFIhvwh68Afgjg/3FZK3pF/OR5gvl4 o86OirR6IXV6td9yIKdRWZwZq2qgcifgFYA70nHHDyHblpvlD69UrP7eW2zYn10yWJbRBW vIzAwmSdZZQ2I67Dqn96ysY5XrDIFMpaIuKfFj93kdMHwtVJ564jHPrwi+N78Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687604341; a=rsa-sha256; cv=none; b=PUj90TLxhIrxCmjg0EEPp3B7Zo0oOSy6J7zoFRQ71n1CMhl/Vug4cYy3xUcwOycIBd6FdA Qe6ZGOvxxVWb1aOzHxWdQqXhvXk7vfSOnXXtits37vbR3yRbT3/O6kSuRqJuCPDkM3nXv5 l5n94fHuwpMPnjoI9CXmrj8NXJTzoSV9L7Js9gI4sbhdtD467uLgCcybC9shptY/PSAOpp A2u9p0nKJWemQYtg9/zjGZR88G1pSDKoIhNNj0wzU7tuEf8piz2Mp5JG4GIvjbq+2ireci /zAga53PJ7lOQMkR83g3aMBKPLBxUFaWg3BV4JMgnHajVgMf7vWhiQx9TmKRYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QpB1d48NRzk0g; Sat, 24 Jun 2023 10:59:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35OAx1tV099451; Sat, 24 Jun 2023 10:59:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35OAx1PY099450; Sat, 24 Jun 2023 10:59:01 GMT (envelope-from git) Date: Sat, 24 Jun 2023 10:59:01 GMT Message-Id: <202306241059.35OAx1PY099450@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 60ef64a60754 - main - lang/spidermonkey78: Fix build with llvm16 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 60ef64a607545972661f3958c8b198a9270324fa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=60ef64a607545972661f3958c8b198a9270324fa commit 60ef64a607545972661f3958c8b198a9270324fa Author: Muhammad Moinur Rahman AuthorDate: 2023-06-24 10:47:30 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-06-24 10:58:48 +0000 lang/spidermonkey78: Fix build with llvm16 - Refresh patches Sponsored by: The FreeBSD Foundation --- .../files/patch-build_moz.configure_flags.configure | 11 +++++++++++ .../files/patch-python_mozbuild_mozbuild_util.py | 11 ++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/lang/spidermonkey78/files/patch-build_moz.configure_flags.configure b/lang/spidermonkey78/files/patch-build_moz.configure_flags.configure new file mode 100644 index 000000000000..24b8f65c80e8 --- /dev/null +++ b/lang/spidermonkey78/files/patch-build_moz.configure_flags.configure @@ -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': diff --git a/lang/spidermonkey78/files/patch-python_mozbuild_mozbuild_util.py b/lang/spidermonkey78/files/patch-python_mozbuild_mozbuild_util.py index 3c5488327fd8..1f91ba15f4c1 100644 --- a/lang/spidermonkey78/files/patch-python_mozbuild_mozbuild_util.py +++ b/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 ( ) @@ -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 = {}