From owner-dev-commits-ports-all@freebsd.org Sat Oct 2 00:13:04 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F0E9A670DAC; Sat, 2 Oct 2021 00:13:04 +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 4HLnW46MKnz3nZK; Sat, 2 Oct 2021 00:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 BA352C53; Sat, 2 Oct 2021 00:13:04 +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 1920D47c091829; Sat, 2 Oct 2021 00:13:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1920D4MW091828; Sat, 2 Oct 2021 00:13:04 GMT (envelope-from git) Date: Sat, 2 Oct 2021 00:13:04 GMT Message-Id: <202110020013.1920D4MW091828@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: b7f6e0701703 - 2021Q3 - www/firefox: unbreak build with devel/llvm13 (lacks patch-D77776) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q3 X-Git-Reftype: branch X-Git-Commit: b7f6e0701703f1efbedf5f92a02eed7c3aa7bbe9 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Oct 2021 00:13:05 -0000 The branch 2021Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b7f6e0701703f1efbedf5f92a02eed7c3aa7bbe9 commit b7f6e0701703f1efbedf5f92a02eed7c3aa7bbe9 Author: Evgeniy Khramtsov AuthorDate: 2021-09-30 22:34:51 +0000 Commit: Jan Beich CommitDate: 2021-10-02 00:12:08 +0000 www/firefox: unbreak build with devel/llvm13 (lacks patch-D77776) Restore patch-bug1628567 to unbreak glslopt crate build due to cc crate passing Rust target "x86_64-unknown-freebsd" without OS version to clang++: [glslopt 0.1.9] cargo:warning=/wrkdirs/usr/ports/www/firefox/work/.build/ ist/system_wrappers/new:3:15: fatal error: 'new' file not found [glslopt 0.1.9] cargo:warning=#include_next PR: 258837 (cherry picked from commit dcc587e70268eb898aecad53ab9d08ea50e0bbab) --- www/firefox/files/patch-bug1628567 | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/www/firefox/files/patch-bug1628567 b/www/firefox/files/patch-bug1628567 new file mode 100644 index 000000000000..32b0dc260d22 --- /dev/null +++ b/www/firefox/files/patch-bug1628567 @@ -0,0 +1,32 @@ +Don't pass --target when CC/CXX contains clang + +diff --git third_party/rust/cc/src/lib.rs third_party/rust/cc/src/lib.rs +index 9d133a0..273e520 100644 +--- third_party/rust/cc/src/lib.rs ++++ third_party/rust/cc/src/lib.rs +@@ -2667,24 +2667,7 @@ impl Tool { + } + + fn with_features(path: PathBuf, clang_driver: Option<&str>, cuda: bool) -> Self { +- // Try to detect family of the tool from its name, falling back to Gnu. +- let family = if let Some(fname) = path.file_name().and_then(|p| p.to_str()) { +- if fname.contains("clang-cl") { +- ToolFamily::Msvc { clang_cl: true } +- } else if fname.ends_with("cl") || fname == "cl.exe" { +- ToolFamily::Msvc { clang_cl: false } +- } else if fname.contains("clang") { +- match clang_driver { +- Some("cl") => ToolFamily::Msvc { clang_cl: true }, +- _ => ToolFamily::Clang, +- } +- } else { +- ToolFamily::Gnu +- } +- } else { +- ToolFamily::Gnu +- }; +- ++ let family = ToolFamily::Gnu; + Tool { + path: path, + cc_wrapper_path: None,