From nobody Wed Jun 28 20:45:52 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 4Qrtrx4lQNz4kZmx; Wed, 28 Jun 2023 20:45:53 +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 4Qrtrx1Z5Dz3nK8; Wed, 28 Jun 2023 20:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687985153; 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=JCNpYcVJiHgjM/TSI2SQkTufHTSvONA7ZNBYtHWe6rs=; b=Qr4sHC9h/TrlLBhRM67kyIZ/wxO9YZm8m2cERoF6Wvw+kMlVetp/Ms4npAIoQg5Y2VQPVz ReP6PXRYSPSOr83xYScKVWYgnV2My+GfXB0nR+l86TQfT1K6m91/WHgwbMfmXNkYciuxV9 6wkGAHUvqCW0nr8a/wrxGpb90U6qkZ90hrym3t/HeuZe7+si9fcwB13m0d3JRljRPnxLbF EieQ960DNI0yrZU3KMeb7pSRJNp5OpWS/dJU0k3/JeOEKnKZcZBQaSYTAStUMhIw/YQSjk dFkpPLOUK0Vqbbl04OjOyXS0OqrYGt+xwbpa2S2BKKIijG5sJVt3kOO44Ku1ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687985153; 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=JCNpYcVJiHgjM/TSI2SQkTufHTSvONA7ZNBYtHWe6rs=; b=HUonw0SmDmfzv4bSYiqL3FUTDP6aRF6YqIbGWdgTm8SHNnTmSF/63/VlaaumQNnB2gaLmp q0DXefUyZREsZig5+Nr6uSkgKs7jbFQEuYWtGdTW15GCXwxznFnFbqK0NBNHmuVe0RW50l zIWdJqK9hkMopH6shB0NpeiaG4hWamlpXMH5IAqEqd5+CYk2zC5TRsEisIMJNn9nuecBKc EMvq6VXfKnzUWdxVtRJlq1J46OL3BnLWSliKFUJirt3BhjJ60gnxOE1O0cK0altMQ60ilL 50243r551ow8V6YZXIu4t8CKboqA1alswYG61CRxhdsFCybh2RcoqvnSLAUYzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687985153; a=rsa-sha256; cv=none; b=D5A4TjHwRefNvIKWVO4kOwQguX8WWhOaY/zOLuCVb7mcStiyCwnJZQmOon7BW+czsGnx+h vG5w1mgh2zVsPNpx6xQ2LNDrt+vtUnkCsA/rZITRLoj4PItdFCAPXnS9LIQ//gqpUQ3rVQ UZdMifjcf6KAyKpfpg/lJYJPd3HUXVGb7U6UyQnwBqJfppXF89Sq/7YZYRpIpdLjObJKNw AAVvUAmjspDK21SPWM85j85TXqq8NSZdc9cnAyw9dLDB673cLIaEoSisJEE8J+0or+u3dq kMTBO0v3Oy1seHT3t5RLN1KhXfeFEqglkEV8qtvMFtKpaEnDUyV9Wp7SVtpDGQ== 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 4Qrtrx0gdXzp9g; Wed, 28 Jun 2023 20:45:53 +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 35SKjrDM058037; Wed, 28 Jun 2023 20:45:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35SKjqiU058036; Wed, 28 Jun 2023 20:45:52 GMT (envelope-from git) Date: Wed, 28 Jun 2023 20:45:52 GMT Message-Id: <202306282045.35SKjqiU058036@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: fd91b46c0272 - main - games/0ad: Fix build with clang 16 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: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fd91b46c02729f5c22df95a0ccc85fd1667d8c49 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=fd91b46c02729f5c22df95a0ccc85fd1667d8c49 commit fd91b46c02729f5c22df95a0ccc85fd1667d8c49 Author: Guido Falsi AuthorDate: 2023-06-28 20:44:55 +0000 Commit: Guido Falsi 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