From nobody Wed Dec 08 11:48:08 2021 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 BCB2F18C0646; Wed, 8 Dec 2021 11:48:08 +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 4J8Fm82GFCz3KbW; Wed, 8 Dec 2021 11:48:08 +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 2ABA112CBA; Wed, 8 Dec 2021 11:48:08 +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 1B8Bm8nK052010; Wed, 8 Dec 2021 11:48:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B8Bm81S052009; Wed, 8 Dec 2021 11:48:08 GMT (envelope-from git) Date: Wed, 8 Dec 2021 11:48:08 GMT Message-Id: <202112081148.1B8Bm81S052009@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tobias Kortkamp Subject: git: 45189a04a220 - main - lang/rust-nightly: Update to 1.59.0.20211207 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: tobik X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 45189a04a2203ec61ff8aa4a850e3dfcf423f2a7 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638964088; 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=5NOJgED7pQHCjCbHw7g7aYpqwf8234UIXVDQh/JIdRs=; b=n9mSJ2Czxq9QfdQ/m5/M2tKe4pZ0ic4ascOALwfbho1KxJSzby9eFFJ5sQLgXMlVaEhEUJ qJuO9QyhDVAfRTSzD4GWlVz41MR+BuOXpylUWEhDp1Qj9aBxyoXRP0gIBKJYN6lUqMh0K7 1ruV+YPf/9xHMJ1FE4OKxDZ7TA/Oc3EbaEU8apmkeCFhu/dPSnYYxDh+qSa0gmMnB2FoAO h3J2gnuJCurlGe1QX9bS4h7kiLQC7FvgCbm9fWDY2rMOvPBDRMLLYuXuwK4SMjDZjaK3Ef 27vPhJkl0OlmjCuSK/B6QIAgp1L01o7cp4isAPojf1eWqslIwKdkLWSznXXYKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638964088; a=rsa-sha256; cv=none; b=qF5KZFVlSjvKb6/misyhMoL0DnCdvoXy/eA2QEgXfJbXsRYMUqFRtCxLYY0OHhVWEhkGD7 VMKmz6GmX+gBwPWDNRm30vAXNRnpPX+3jiMXrlqgZDy9a4RLXT/D0MERNDZJsuRcKWpEJ9 BPFTS/p3sNhEpajdWPqYMXXbB19eG8baQQ+ISth6xq7elua5PKB68zZdpytGFCw/FFhIlJ yHndPrey4d1EhMXbsUFjVILS6oJwUvmJ77gY82XRXGsxRj+pvIzeU+WCTjM7yazvgqWDAk tVrM+WgpjKB20Mg5DNlX4ZLTIlFVyhbNUgpiHn92dsI6o92L4OtWIx6kyGQBwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tobik: URL: https://cgit.FreeBSD.org/ports/commit/?id=45189a04a2203ec61ff8aa4a850e3dfcf423f2a7 commit 45189a04a2203ec61ff8aa4a850e3dfcf423f2a7 Author: Tobias Kortkamp AuthorDate: 2021-12-08 10:14:25 +0000 Commit: Tobias Kortkamp CommitDate: 2021-12-08 11:40:39 +0000 lang/rust-nightly: Update to 1.59.0.20211207 Changes: https://github.com/rust-lang/rust/compare/686e313a9aa14107c8631ffe48fa09110a7692db...0b6f079e4987ded15c13a15b734e7cfb8176839f --- lang/rust-nightly/Makefile | 4 +-- lang/rust-nightly/distinfo | 18 +++++----- .../files/patch-vendor_cc-1.0.69_src_lib.rs | 38 ++++++++++++++++++++++ 3 files changed, 49 insertions(+), 11 deletions(-) diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile index ac214de18036..0bfa701f7638 100644 --- a/lang/rust-nightly/Makefile +++ b/lang/rust-nightly/Makefile @@ -16,8 +16,8 @@ MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo -NIGHTLY_DATE= 2021-11-28 -BOOTSTRAPS_DATE= 2021-10-22 +NIGHTLY_DATE= 2021-12-07 +BOOTSTRAPS_DATE= 2021-11-30 RUST_BOOTSTRAP_VERSION= beta .include "${MASTERDIR}/Makefile" diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo index d227b261c9a2..6e72fde2c34d 100644 --- a/lang/rust-nightly/distinfo +++ b/lang/rust-nightly/distinfo @@ -1,9 +1,9 @@ -TIMESTAMP = 1638185169 -SHA256 (rust/2021-11-28/rustc-nightly-src.tar.xz) = 99e1190021c1b38d23d489104f73ea131a9974481b486590a97caeb1f972bb3f -SIZE (rust/2021-11-28/rustc-nightly-src.tar.xz) = 124253780 -SHA256 (rust/2021-10-22/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 0c01b34ed39016866e945e0f01de830a68c54f7eef2ac83c3ab85318b01debb0 -SIZE (rust/2021-10-22/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 88136372 -SHA256 (rust/2021-10-22/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 9e951fec5ee4a4a655693d1c9e205413aeb3120a7b2c0bb6673f4392cdf9fa6d -SIZE (rust/2021-10-22/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 25586116 -SHA256 (rust/2021-10-22/cargo-beta-x86_64-unknown-freebsd.tar.xz) = b61464e9e1c2e820a237f1f3d91cae8b0e62cda16dea51b32a8cf695b7a5707c -SIZE (rust/2021-10-22/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 6539980 +TIMESTAMP = 1638958016 +SHA256 (rust/2021-12-07/rustc-nightly-src.tar.xz) = cdeefbe16e8735dd684875c42ae7c262998dce2ecf9d3ba2df64ab72e9be99e4 +SIZE (rust/2021-12-07/rustc-nightly-src.tar.xz) = 124335936 +SHA256 (rust/2021-11-30/rustc-beta-x86_64-unknown-freebsd.tar.xz) = fa2464350b2ac29bec6751c551cc45b7af92c25d2cf1109397e724802d4859cf +SIZE (rust/2021-11-30/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 88129588 +SHA256 (rust/2021-11-30/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = e94ecf7d1c9a5144577fdb14b7232b11dff0ebbfa8aae8cb4884d4ed9c5bae77 +SIZE (rust/2021-11-30/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 26545584 +SHA256 (rust/2021-11-30/cargo-beta-x86_64-unknown-freebsd.tar.xz) = a277a3fccfba30db2942c8303db16e5112d72c7721fe7a777cf24a301b68ad2c +SIZE (rust/2021-11-30/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 6484112 diff --git a/lang/rust-nightly/files/patch-vendor_cc-1.0.69_src_lib.rs b/lang/rust-nightly/files/patch-vendor_cc-1.0.69_src_lib.rs new file mode 100644 index 000000000000..1027757e0c34 --- /dev/null +++ b/lang/rust-nightly/files/patch-vendor_cc-1.0.69_src_lib.rs @@ -0,0 +1,38 @@ +When the compiler has "clang" in its name the cc crate will pass +an LLVM target triple to it. Rust uses a triple that lacks the OS +version and LLVM will default to FreeBSD 9 behavior, i.e., it will +default to libstdc++ which is no longer available in newer releases. + +To avoid this issue assume we have a GNU compatible toolchain instead +until LLVM can be updated to use libc++ by default. + +https://reviews.llvm.org/D77776 + +--- vendor/cc-1.0.69/src/lib.rs.orig 2021-03-04 20:58:54 UTC ++++ vendor/cc-1.0.69/src/lib.rs +@@ -2659,24 +2659,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,