Index: head/lang/rust-nightly/Makefile =================================================================== --- head/lang/rust-nightly/Makefile (revision 531921) +++ head/lang/rust-nightly/Makefile (revision 531922) @@ -1,33 +1,33 @@ # Created by: Jean-Sébastien Pédron # $FreeBSD$ PORTVERSION= 1.44.0.${NIGHTLY_DATE:C,-,,g} # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust PORTREVISION= 0 PKGNAMESUFFIX= -nightly DISTNAME= rustc-nightly-src ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= upstream does not provide bootstraps for other architectures CONFLICTS_INSTALL= rust MASTERDIR= ${.CURDIR}/../rust PATCHDIR= ${.CURDIR}/files DISTINFO_FILE= ${.CURDIR}/distinfo # Get latest from top level 'date' key in # https://static.rust-lang.org/dist/channel-rust-nightly.toml -NIGHTLY_DATE= 2020-04-09 +NIGHTLY_DATE= 2020-04-17 # See WRKSRC/src/stage0.txt for this date BOOTSTRAPS_DATE= 2020-03-12 RUST_BOOTSTRAP_VERSION= beta CARGO_BOOTSTRAP_VERSION= beta post-configure: # Don't abort if optional tools fail to build # https://github.com/rust-lang/rust/commit/53254a888b42 @${ECHO_CMD} 'missing-tools = true' >>${WRKSRC}/config.toml .include "${MASTERDIR}/Makefile" Index: head/lang/rust-nightly/distinfo =================================================================== --- head/lang/rust-nightly/distinfo (revision 531921) +++ head/lang/rust-nightly/distinfo (revision 531922) @@ -1,15 +1,15 @@ -TIMESTAMP = 1586404359 -SHA256 (rust/2020-04-09/rustc-nightly-src.tar.xz) = bd63d2138aaebfaad7ac01189e8df442192d714603d64e25f37eaab01205fc6e -SIZE (rust/2020-04-09/rustc-nightly-src.tar.xz) = 94582740 +TIMESTAMP = 1587089218 +SHA256 (rust/2020-04-17/rustc-nightly-src.tar.xz) = 1fc625e21b860bed3ff52e7cd0e024d5459f3e9903c4e44c3ddf893605784ac8 +SIZE (rust/2020-04-17/rustc-nightly-src.tar.xz) = 94721724 SHA256 (rust/2020-03-12/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 8a1fa4555d128dcf89958f7ea5ff476408903e76ea2f6c97f3da6d131b0c040f SIZE (rust/2020-03-12/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 35928800 SHA256 (rust/2020-03-12/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = d1faf86633140c059ee6f6d7ba7ae3f637385a8a78b98a97f6084d001497d650 SIZE (rust/2020-03-12/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 16793056 SHA256 (rust/2020-03-12/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 92fad696c7441c2ae31b6d722f0e55e1462d30310a5ce1c4008d88a3b8461ab6 SIZE (rust/2020-03-12/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 5128712 SHA256 (rust/2020-03-12/rustc-beta-i686-unknown-freebsd.tar.xz) = 160c0927858f5e702a3da2b0a3e5d9a02384fe892c9e0304429edb8ebe5518a8 SIZE (rust/2020-03-12/rustc-beta-i686-unknown-freebsd.tar.xz) = 37223092 SHA256 (rust/2020-03-12/rust-std-beta-i686-unknown-freebsd.tar.xz) = 33e82095a7dcde03249084295dcd47daedfdd44d884ad71c7960c7553136cfc6 SIZE (rust/2020-03-12/rust-std-beta-i686-unknown-freebsd.tar.xz) = 16790808 SHA256 (rust/2020-03-12/cargo-beta-i686-unknown-freebsd.tar.xz) = 0c2cde352e4a384100d71fa99f3d872ab5a955320ff57b5eac6d152d7d87a6e5 SIZE (rust/2020-03-12/cargo-beta-i686-unknown-freebsd.tar.xz) = 5033880 Index: head/lang/rust-nightly/files/patch-vendor_cc_src_lib.rs =================================================================== --- head/lang/rust-nightly/files/patch-vendor_cc_src_lib.rs (nonexistent) +++ head/lang/rust-nightly/files/patch-vendor_cc_src_lib.rs (revision 531922) @@ -0,0 +1,42 @@ +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/src/lib.rs.orig 2020-04-14 08:55:10 UTC ++++ vendor/cc/src/lib.rs +@@ -2353,28 +2353,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.contains("cl") +- && !fname.contains("cloudabi") +- && !fname.contains("uclibc") +- && !fname.contains("clang") +- { +- 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, Property changes on: head/lang/rust-nightly/files/patch-vendor_cc_src_lib.rs ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/rust-nightly/files/patch-vendor_libgit2-sys_build.rs =================================================================== --- head/lang/rust-nightly/files/patch-vendor_libgit2-sys_build.rs (nonexistent) +++ head/lang/rust-nightly/files/patch-vendor_libgit2-sys_build.rs (revision 531922) @@ -0,0 +1,11 @@ +--- vendor/libgit2-sys/build.rs.orig 2020-04-17 09:21:48 UTC ++++ vendor/libgit2-sys/build.rs +@@ -8,7 +8,7 @@ fn main() { + let ssh = env::var("CARGO_FEATURE_SSH").is_ok(); + + let mut cfg = pkg_config::Config::new(); +- if let Ok(lib) = cfg.atleast_version("1.0.0").probe("libgit2") { ++ if let Ok(lib) = cfg.atleast_version("0.99.0").probe("libgit2") { + for include in &lib.include_paths { + println!("cargo:root={}", include.display()); + } Property changes on: head/lang/rust-nightly/files/patch-vendor_libgit2-sys_build.rs ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property