Date: Fri, 24 Jan 2020 20:53:32 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r523985 - in head/lang: rust rust-nightly rust-nightly/files Message-ID: <202001242053.00OKrWjF091861@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Fri Jan 24 20:53:31 2020 New Revision: 523985 URL: https://svnweb.freebsd.org/changeset/ports/523985 Log: lang/rust-nightly: Update to 1.42.0.20200124 Nightly bootstraps now have the fix from r523512. Switch to them for the time being and drop the workaround. Modified: head/lang/rust-nightly/Makefile head/lang/rust-nightly/distinfo head/lang/rust-nightly/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs head/lang/rust/Makefile Modified: head/lang/rust-nightly/Makefile ============================================================================== --- head/lang/rust-nightly/Makefile Fri Jan 24 19:47:59 2020 (r523984) +++ head/lang/rust-nightly/Makefile Fri Jan 24 20:53:31 2020 (r523985) @@ -16,13 +16,15 @@ CONFLICTS_INSTALL= rust # Which source to pull: # https://static.rust-lang.org/dist/${NIGHTLY_DATE}/rustc-nightly-src.tar.gz # https://static.rust-lang.org/dist/channel-rust-nightly.toml -NIGHTLY_DATE= 2020-01-18 +NIGHTLY_DATE= 2020-01-24 NIGHTLY_SUBDIR= ${NIGHTLY_DATE}/ # See WRKSRC/src/stage0.txt for this date -BOOTSTRAPS_DATE= 2020-01-15 -RUST_BOOTSTRAP_VERSION= beta -CARGO_BOOTSTRAP_VERSION= beta +# XXX: Keep on nightly after 2020-01-24 for 13.0 i386 until beta has +# https://github.com/rust-lang/rust/commit/de388032555b697d1b0ef197241886ab90ac39b2 +BOOTSTRAPS_DATE= ${NIGHTLY_DATE} +RUST_BOOTSTRAP_VERSION= nightly +CARGO_BOOTSTRAP_VERSION= nightly CARGO_VENDOR_DIR= ${WRKSRC}/vendor Modified: head/lang/rust-nightly/distinfo ============================================================================== --- head/lang/rust-nightly/distinfo Fri Jan 24 19:47:59 2020 (r523984) +++ head/lang/rust-nightly/distinfo Fri Jan 24 20:53:31 2020 (r523985) @@ -1,15 +1,15 @@ -TIMESTAMP = 1579333779 -SHA256 (rust/2020-01-18/rustc-nightly-src.tar.xz) = 04a7a543d7426731f70ed311631672790039f417a6e54a832d4d284d93e0a57c -SIZE (rust/2020-01-18/rustc-nightly-src.tar.xz) = 94026600 -SHA256 (rust/2020-01-15/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 247f7ab3139be65d297e3097cf0d5d415fdb3131284d8457e231a7ac1afa7403 -SIZE (rust/2020-01-15/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 33988076 -SHA256 (rust/2020-01-15/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = ae7bc6c37696addb8f657c0a725585e311130e7de8fa24c47e4ebdb287a1c4b6 -SIZE (rust/2020-01-15/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 16512240 -SHA256 (rust/2020-01-15/cargo-beta-x86_64-unknown-freebsd.tar.xz) = ac224ab64297d04dae7303a34aa634eed91eb6b0d3353ccf15ebaeabce303f67 -SIZE (rust/2020-01-15/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 4946984 -SHA256 (rust/2020-01-15/rustc-beta-i686-unknown-freebsd.tar.xz) = 6bb6e1752021c1921c3baf4cf62d5dd63c7b4161fa93cc3bca7b7f846ba32e26 -SIZE (rust/2020-01-15/rustc-beta-i686-unknown-freebsd.tar.xz) = 34544896 -SHA256 (rust/2020-01-15/rust-std-beta-i686-unknown-freebsd.tar.xz) = 9b3091a5ca567b382c22454f57f5e8e8d66c54888129c2f49e7c7eb2071ce5ae -SIZE (rust/2020-01-15/rust-std-beta-i686-unknown-freebsd.tar.xz) = 16507016 -SHA256 (rust/2020-01-15/cargo-beta-i686-unknown-freebsd.tar.xz) = b868e5ca047cc016dd2d3791b7f9ed877f889352aee827da6ee4d97febe4691c -SIZE (rust/2020-01-15/cargo-beta-i686-unknown-freebsd.tar.xz) = 4867340 +TIMESTAMP = 1579899008 +SHA256 (rust/2020-01-24/rustc-nightly-src.tar.xz) = 2a0fc007efb64068693b0141fe9e3e2c19a1a00a60844582278b47b1450240ac +SIZE (rust/2020-01-24/rustc-nightly-src.tar.xz) = 94056884 +SHA256 (rust/2020-01-24/rustc-nightly-x86_64-unknown-freebsd.tar.xz) = 38f125afc6fad8902eeb02ea2971e0632141f3f6e30cce8f07617e824b033887 +SIZE (rust/2020-01-24/rustc-nightly-x86_64-unknown-freebsd.tar.xz) = 34418996 +SHA256 (rust/2020-01-24/rust-std-nightly-x86_64-unknown-freebsd.tar.xz) = abef7d8694f64ed8cbbcc259475cadedd48176286a5797dd742d1401e0f9a1d8 +SIZE (rust/2020-01-24/rust-std-nightly-x86_64-unknown-freebsd.tar.xz) = 16548420 +SHA256 (rust/2020-01-24/cargo-nightly-x86_64-unknown-freebsd.tar.xz) = 574bd22871f5e560921345ca21ce09ce0375fcca14f6802336f661061009b056 +SIZE (rust/2020-01-24/cargo-nightly-x86_64-unknown-freebsd.tar.xz) = 5020868 +SHA256 (rust/2020-01-24/rustc-nightly-i686-unknown-freebsd.tar.xz) = 15ff2eeaad362c083b722c6211977ec5d63750b384a0585b4a699cce20690246 +SIZE (rust/2020-01-24/rustc-nightly-i686-unknown-freebsd.tar.xz) = 35622756 +SHA256 (rust/2020-01-24/rust-std-nightly-i686-unknown-freebsd.tar.xz) = de74af8d86f95f3905b1cc4655e492bc49c22b2fedfabf277cb094597f1f6b04 +SIZE (rust/2020-01-24/rust-std-nightly-i686-unknown-freebsd.tar.xz) = 16483576 +SHA256 (rust/2020-01-24/cargo-nightly-i686-unknown-freebsd.tar.xz) = ebab904aae34ad1207a72089489844ced6a62574fb27caffcaf87ef120e1fa45 +SIZE (rust/2020-01-24/cargo-nightly-i686-unknown-freebsd.tar.xz) = 4918932 Modified: head/lang/rust-nightly/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs ============================================================================== --- head/lang/rust-nightly/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs Fri Jan 24 19:47:59 2020 (r523984) +++ head/lang/rust-nightly/files/patch-src_librustc__target_spec_i686__unknown__freebsd.rs Fri Jan 24 20:53:31 2020 (r523985) @@ -1,16 +1,11 @@ ---- src/librustc_target/spec/i686_unknown_freebsd.rs.orig 2020-01-17 16:00:01 UTC +--- src/librustc_target/spec/i686_unknown_freebsd.rs.orig 2020-01-23 19:40:44 UTC +++ src/librustc_target/spec/i686_unknown_freebsd.rs -@@ -2,9 +2,11 @@ use crate::spec::{LinkerFlavor, Target, TargetResult}; +@@ -2,7 +2,7 @@ use crate::spec::{LinkerFlavor, Target, TargetResult}; pub fn target() -> TargetResult { let mut base = super::freebsd_base::opts(); - base.cpu = "pentium4".to_string(); + base.cpu = "pentiumpro".to_string(); base.max_atomic_width = Some(64); -- base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m32".to_string()); -+ let pre_link_args = base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap(); -+ pre_link_args.push("-m32".to_string()); -+ pre_link_args.push("-Wl,-znotext".to_string()); - base.stack_probes = true; - - Ok(Target { + let pre_link_args = base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap(); + pre_link_args.push("-m32".to_string()); Modified: head/lang/rust/Makefile ============================================================================== --- head/lang/rust/Makefile Fri Jan 24 19:47:59 2020 (r523984) +++ head/lang/rust/Makefile Fri Jan 24 20:53:31 2020 (r523985) @@ -172,14 +172,7 @@ do-configure: @${ECHO_CMD} '[target.${_RUST_TARGET}]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'cc="${CC}"' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'cxx="${CXX}"' >> ${WRKSRC}/config.toml -.if ${PKGNAMESUFFIX:U} == -nightly && ${ARCH} == i386 -# https://github.com/rust-lang/rust/pull/68361 - @${PRINTF} '#!/bin/sh\nexec ${CC} -Wl,-znotext "$$@"' > ${WRKDIR}/cc-wrapper - @${CHMOD} +x ${WRKDIR}/cc-wrapper - @${ECHO_CMD} 'linker="${WRKDIR}/cc-wrapper"' >> ${WRKSRC}/config.toml -.else @${ECHO_CMD} 'linker="${CC}"' >> ${WRKSRC}/config.toml -.endif @${ECHO_CMD} '[dist]' >> ${WRKSRC}/config.toml @${ECHO_CMD} 'src-tarball=false' >> ${WRKSRC}/config.toml @${REINPLACE_CMD} -e 's,%CC%,${CC},g' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001242053.00OKrWjF091861>