From f716eb743024e4a812f13f9c68628b97bd5dd415 Mon Sep 17 00:00:00 2001 From: ryoon Date: Sat, 19 Jan 2019 12:44:08 +0000 Subject: [PATCH] Update to 1.32.0 Changelog: Version 1.32.0 (2019-01-17) ========================== Language -------- #### 2018 edition - [You can now use the `?` operator in macro definitions.][56245] The `?` operator allows you to specify zero or one repetitions similar to the `*` and `+` operators. - [Module paths with no leading keyword like `super`, `self`, or `crate`, will now always resolve to the item (`enum`, `struct`, etc.) available in the module if present, before resolving to a external crate or an item the prelude.][56759] E.g. ```rust enum Color { Red, Green, Blue } use Color::*; ``` #### All editions - [You can now match against `PhantomData` types.][55837] - [You can now match against literals in macros with the `literal` specifier.][56072] This will match against a literal of any type. E.g. `1`, `'A'`, `"Hello World"` - [Self can now be used as a constructor and pattern for unit and tuple structs.][56365] E.g. ```rust struct Point(i32, i32); impl Point { pub fn new(x: i32, y: i32) -> Self { Self(x, y) } pub fn is_origin(&self) -> bool { match self { Self(0, 0) => true, _ => false, } } } ``` - [Self can also now be used in type definitions.][56366] E.g. ```rust enum List where Self: PartialOrd // can write `Self` instead of `List` { Nil, Cons(T, Box) // likewise here } ``` - [You can now mark traits with `#[must_use]`.][55663] This provides a warning if a `impl Trait` or `dyn Trait` is returned and unused in the program. Compiler -------- - [The default allocator has changed from jemalloc to the default allocator on your system.][55238] The compiler itself on Linux & macOS will still use jemalloc, but programs compiled with it will use the system allocator. - [Added the `aarch64-pc-windows-msvc` target.][55702] Libraries --------- - [`PathBuf` now implements `FromStr`.][55148] - [`Box<[T]>` now implements `FromIterator`.][55843] - [The `dbg!` macro has been stabilized.][56395] This macro enables you to easily debug expressions in your rust program. E.g. ```rust let a = 2; let b = dbg!(a * 2) + 1; // ^-- prints: [src/main.rs:4] a * 2 = 4 assert_eq!(b, 5); ``` The following APIs are now `const` functions and can be used in a `const` context. - [`Cell::as_ptr`] - [`UnsafeCell::get`] - [`char::is_ascii`] - [`iter::empty`] - [`ManuallyDrop::new`] - [`ManuallyDrop::into_inner`] - [`RangeInclusive::start`] - [`RangeInclusive::end`] - [`NonNull::as_ptr`] - [`slice::as_ptr`] - [`str::as_ptr`] - [`Duration::as_secs`] - [`Duration::subsec_millis`] - [`Duration::subsec_micros`] - [`Duration::subsec_nanos`] - [`CStr::as_ptr`] - [`Ipv4Addr::is_unspecified`] - [`Ipv6Addr::new`] - [`Ipv6Addr::octets`] Stabilized APIs --------------- - [`i8::to_be_bytes`] - [`i8::to_le_bytes`] - [`i8::to_ne_bytes`] - [`i8::from_be_bytes`] - [`i8::from_le_bytes`] - [`i8::from_ne_bytes`] - [`i16::to_be_bytes`] - [`i16::to_le_bytes`] - [`i16::to_ne_bytes`] - [`i16::from_be_bytes`] - [`i16::from_le_bytes`] - [`i16::from_ne_bytes`] - [`i32::to_be_bytes`] - [`i32::to_le_bytes`] - [`i32::to_ne_bytes`] - [`i32::from_be_bytes`] - [`i32::from_le_bytes`] - [`i32::from_ne_bytes`] - [`i64::to_be_bytes`] - [`i64::to_le_bytes`] - [`i64::to_ne_bytes`] - [`i64::from_be_bytes`] - [`i64::from_le_bytes`] - [`i64::from_ne_bytes`] - [`i128::to_be_bytes`] - [`i128::to_le_bytes`] - [`i128::to_ne_bytes`] - [`i128::from_be_bytes`] - [`i128::from_le_bytes`] - [`i128::from_ne_bytes`] - [`isize::to_be_bytes`] - [`isize::to_le_bytes`] - [`isize::to_ne_bytes`] - [`isize::from_be_bytes`] - [`isize::from_le_bytes`] - [`isize::from_ne_bytes`] - [`u8::to_be_bytes`] - [`u8::to_le_bytes`] - [`u8::to_ne_bytes`] - [`u8::from_be_bytes`] - [`u8::from_le_bytes`] - [`u8::from_ne_bytes`] - [`u16::to_be_bytes`] - [`u16::to_le_bytes`] - [`u16::to_ne_bytes`] - [`u16::from_be_bytes`] - [`u16::from_le_bytes`] - [`u16::from_ne_bytes`] - [`u32::to_be_bytes`] - [`u32::to_le_bytes`] - [`u32::to_ne_bytes`] - [`u32::from_be_bytes`] - [`u32::from_le_bytes`] - [`u32::from_ne_bytes`] - [`u64::to_be_bytes`] - [`u64::to_le_bytes`] - [`u64::to_ne_bytes`] - [`u64::from_be_bytes`] - [`u64::from_le_bytes`] - [`u64::from_ne_bytes`] - [`u128::to_be_bytes`] - [`u128::to_le_bytes`] - [`u128::to_ne_bytes`] - [`u128::from_be_bytes`] - [`u128::from_le_bytes`] - [`u128::from_ne_bytes`] - [`usize::to_be_bytes`] - [`usize::to_le_bytes`] - [`usize::to_ne_bytes`] - [`usize::from_be_bytes`] - [`usize::from_le_bytes`] - [`usize::from_ne_bytes`] Cargo ----- - [You can now run `cargo c` as an alias for `cargo check`.][cargo/6218] - [Usernames are now allowed in alt registry URLs.][cargo/6242] Misc ---- - [`libproc_macro` has been added to the `rust-src` distribution.][55280] Compatibility Notes ------------------- - [The argument types for AVX's `_mm256_stream_si256`, `_mm256_stream_pd`, `_mm256_stream_ps`][55610] have been changed from `*const` to `*mut` as the previous implementation was unsound. [55148]: https://github.com/rust-lang/rust/pull/55148/ [55238]: https://github.com/rust-lang/rust/pull/55238/ [55280]: https://github.com/rust-lang/rust/pull/55280/ [55610]: https://github.com/rust-lang/rust/pull/55610/ [55663]: https://github.com/rust-lang/rust/pull/55663/ [55702]: https://github.com/rust-lag/rust/pull/55702/ [55837]: https://github.com/rust-lang/rust/pull/55837/ [55843]: https://github.com/rust-lang/rust/pull/55843/ [56072]: https://github.com/rust-lang/rust/pull/56072/ [56245]: https://github.com/rust-lang/rust/pull/56245/ [56365]: https:/ttps://github.com/rust-lang/rust/pull/56395/ [56759]: https://github.com/rust-lang/rust/pull/56759/ [cargo/6218]: https://github.com/rust-lang/cargo/pull/6218/ [cargo/6242]: https://github.com/rust-lang/cargo/pull/6242/ [`CStr::as_ptr`]: https://doc.rust-`Duration::as_secs`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.as_secs [`Duration::subsec_micros`]: https://doc.rust-lang.org/std/time/struct.Duration.html#method.subsec_micros [`Duration::subsec_millis`]: https://doc.rust-lang.org/sct.Duration.html#method.subsec_nanos [`Ipv4Addr::is_unspecified`]: https://doc.rust-lang.org/std/net/struct.Ipv4Addr.html#method.is_unspecified [`Ipv6Addr::new`]: https://doc.rust-lang.org/std/net/struct.Ipv6Addr.html#method.new [`Ipv6Addr::octets`]: httpw`]: https://doc.rust-lang.org/std/mem/struct.ManuallyDrop.html#method.new [`NonNull::as_ptr`]: https://doc.rust-lang.org/std/ptr/struct.NonNull.html#method.as_ptr [`RangeInclusive::end`]: https://doc.rust-lang.org/std/ops/struct.RangeInclusive.html#method.end [`RangeInclusive::start`]: https://doc.rust-lang.org/std/ops/struct.RangeInclusive.html#method.start [`UnsafeCell::get`]: https://doc.rust-lang.org/std/cell/struct.UnsafeCell.html#method.get [`slice::as_ptr`]: https://doc.rust-lang.org/std/primitive.slice.html#method.as_ptr [`char::is_ascii`]: https://doc.rust-lang.org/std/primitive.char.html#method.is_ascii [`i128::from_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i128.html#method.from_be_bytes [`i128::from_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i128.html#method.from_le_bytes [`i128::from_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i128.html#method.from_ne_bytes [`i128::to_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i128.html#method.to_be_bytes [`i128::to_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i128.html#method.to_le_bytes [`i128::to_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i128.html#method.to_ne_bytes [`i16::from_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i16.html#method.from_be_bytes [`i16::from_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i16.html#method.from_le_bytes [`i16::from_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i16.html#method.from_ne_bytes [`i16::to_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i16.html#method.to_be_bytes [`i16::to_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i16.html#method.to_le_bytes [`i16::to_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i16.html#method.to_ne_bytes [`i32::from_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i32.html#method.from_be_bytes [`i32::from_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i32.html#method.from_le_bytes [`i32::from_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i32.html#method.from_ne_bytes [`i32::to_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i32.html#method.to_be_bytes [`i32::to_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i32.html#method.to_le_bytes [`i32::to_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i32.html#method.to_ne_bytes [`i64::from_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i64.html#method.from_be_bytes [`i64::from_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i64.html#method.from_le_bytes [`i64::from_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i64.html#method.from_ne_bytes [`i64::to_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i64.html#method.to_be_bytes [`i64::to_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i64.html#method.to_le_bytes [`i64::to_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i64.html#method.to_ne_bytes [`i8::from_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i8.html#method.from_be_bytes [`i8::from_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i8.html#method.from_le_bytes [`i8::from_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i8.html#method.from_ne_bytes [`i8::to_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i8.html#method.to_be_bytes [`i8::to_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i8.html#method.to_le_bytes [`i8::to_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.i8.html#method.to_ne_bytes [`isize::from_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.isize.html#method.from_be_bytes [`isize::from_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.isize.html#method.from_le_bytes [`isize::from_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.isize.html#method.from_ne_bytes [`isize::to_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.isize.html#method.to_be_bytes [`isize::to_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.isize.html#method.to_le_bytes [`isize::to_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.isize.html#method.to_ne_bytes [`iter::empty`]: https://doc.rust-lang.org/std/iter/fn.empty.html [`str::as_ptr`]: https://doc.rust-lang.org/std/primitive.str.html#method.as_ptr [`u128::from_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u128.html#method.from_be_bytes [`u128::from_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u128.html#method.from_le_bytes [`u128::from_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u128.html#method.from_ne_bytes [`u128::to_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u128.html#method.to_be_bytes [`u128::to_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u128.html#method.to_le_bytes [`u128::to_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u128.html#method.to_ne_bytes [`u16::from_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u16.html#method.from_be_bytes [`u16::from_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u16.html#method.from_le_bytes [`u16::from_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u16.html#method.from_ne_bytes [`u16::to_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u16.html#method.to_be_bytes [`u16::to_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u16.html#method.to_le_bytes [`u16::to_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u16.html#method.to_ne_bytes [`u32::from_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u32.html#method.from_be_bytes [`u32::from_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u32.html#method.from_le_bytes [`u32::from_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u32.html#method.from_ne_bytes [`u32::to_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u32.html#method.to_be_bytes [`u32::to_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u32.html#method.to_le_bytes [`u32::to_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u32.html#method.to_ne_bytes [`u64::from_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u64.html#method.from_be_bytes [`u64::from_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u64.html#method.from_le_bytes [`u64::from_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u64.html#method.from_ne_bytes [`u64::to_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u64.html#method.to_be_bytes [`u64::to_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u64.html#method.to_le_bytes [`u64::to_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u64.html#method.to_ne_bytes [`u8::from_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.from_be_bytes [`u8::from_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.from_le_bytes [`u8::from_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.from_ne_bytes [`u8::to_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.to_be_bytes [`u8::to_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.to_le_bytes [`u8::to_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.u8.html#method.to_ne_bytes [`usize::from_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.usize.html#method.from_be_bytes [`usize::from_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.usize.html#method.from_le_bytes [`usize::from_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.usize.html#method.from_ne_bytes [`usize::to_be_bytes`]: https://doc.rust-lang.org/stable/std/primitive.usize.html#method.to_be_bytes [`usize::to_le_bytes`]: https://doc.rust-lang.org/stable/std/primitive.usize.html#method.to_le_bytes [`usize::to_ne_bytes`]: https://doc.rust-lang.org/stable/std/primitive.usize.html#method.to_ne_bytes --- lang/rust/Makefile | 41 ++--- lang/rust/distinfo | 154 +++++++++--------- .../patches/patch-src_bootstrap_bin_rustc.rs | 12 +- lang/rust/patches/patch-src_bootstrap_lib.rs | 10 +- ...libc_src_unix_bsd_netbsdlike_netbsd_mod.rs | 137 ---------------- lang/rust/patches/patch-src_libstd_build.rs | 15 +- .../patch-src_vendor_rand_src_rngs_os.rs | 15 -- 7 files changed, 110 insertions(+), 274 deletions(-) delete mode 100644 lang/rust/patches/patch-src_liblibc_src_unix_bsd_netbsdlike_netbsd_mod.rs delete mode 100644 lang/rust/patches/patch-src_vendor_rand_src_rngs_os.rs diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 820ddfbf17d8..9fdd322badf3 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.73 2019/01/05 23:29:40 tnn Exp $ +# $NetBSD: Makefile,v 1.74 2019/01/19 12:44:08 ryoon Exp $ -DISTNAME= rustc-1.31.1-src -PKGREVISION= 1 +DISTNAME= rustc-1.32.0-src PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} CATEGORIES= lang MASTER_SITES= http://static.rust-lang.org/dist/ @@ -18,6 +17,8 @@ USE_TOOLS+= bash ggrep gmake perl:build pkg-config # For internal llvm BUILD_DEPENDS+= cmake-[0-9]*:../../devel/cmake +CHECK_PORTABILITY_SKIP+=vendor/openssl-src/openssl/.travis-create-release.sh + HAS_CONFIGURE= yes PYTHON_FOR_BUILD_ONLY= yes CONFIG_SHELL= ${PYTHONBIN} @@ -131,10 +132,10 @@ BUILDLINK_TRANSFORM.NetBSD+= rm:-Wl,--enable-new-dtags # own bootstrap. See the stage0-bootstrap below for more details. # DISTFILES:= ${DEFAULT_DISTFILES} -RUST_STAGE0_VER= 1.30.1 +RUST_STAGE0_VER= 1.31.1 # .if !empty(MACHINE_PLATFORM:MDarwin-*-i386) || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.30.1 +RUST_STAGE0_VER= 1.31.1 RUST_ARCH:= i686-apple-darwin RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz @@ -142,7 +143,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} pre-build-fix: .endif .if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.30.1 +RUST_STAGE0_VER= 1.31.1 RUST_ARCH:= x86_64-apple-darwin RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz @@ -150,7 +151,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} pre-build-fix: .endif .if !empty(MACHINE_PLATFORM:MLinux-*-i386) || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.30.1 +RUST_STAGE0_VER= 1.31.1 RUST_ARCH:= i686-unknown-linux-gnu RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz @@ -158,7 +159,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} pre-build-fix: .endif .if !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.30.1 +RUST_STAGE0_VER= 1.31.1 RUST_ARCH:= x86_64-unknown-linux-gnu RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz @@ -166,7 +167,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} pre-build-fix: .endif .if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.30.0 +RUST_STAGE0_VER= 1.31.0 RUST_ARCH:= x86_64-sun-solaris RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz SITES.${RUST_STAGE0}= https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/ @@ -175,7 +176,7 @@ RUST_BOOTSTRAP_PATH?= ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH} pre-build-fix: .endif .if !empty(MACHINE_PLATFORM:MFreeBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.30.1 +RUST_STAGE0_VER= 1.31.1 RUST_ARCH:= i686-unknown-freebsd RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz @@ -183,7 +184,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} pre-build-fix: .endif .if !empty(MACHINE_PLATFORM:MFreeBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.30.1 +RUST_STAGE0_VER= 1.31.1 RUST_ARCH:= x86_64-unknown-freebsd RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz @@ -191,7 +192,7 @@ DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} pre-build-fix: .endif .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.30.1 +RUST_STAGE0_VER= 1.31.1 RUST_ARCH= i686-unknown-netbsd RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz @@ -208,7 +209,7 @@ pre-build-fix: ${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/cargo .endif .if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) -RUST_STAGE0_VER= 1.30.1 +RUST_STAGE0_VER= 1.31.1 RUST_ARCH= x86_64-unknown-netbsd RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz @@ -280,16 +281,7 @@ post-extract: ${TOOLS_BASH} ./install.sh --prefix=${RUST_BOOTSTRAP_PATH}; \ fi # patch(1) in NetBSD does not handle .cargo-checksum.json like long width file. - cat ${WRKSRC}/src/vendor/libc/.cargo-checksum.json | \ - ${SED} -e 's/9c6af198a2f80da827054784faf70bc404673d9568fb45664b4f73c46245fdbd/c3851969a854d6ccaa8a94369f1288025149d1ebdc74b36f224423f35b18f7a7/' > \ - ${WRKSRC}/src/vendor/libc/.cargo-checksum.json.patched - cat ${WRKSRC}/src/vendor/rand/.cargo-checksum.json | \ - ${SED} -e 's/cb94a0b54e47022b2e9b58b45e0196785c61d083760333276226da435cc040d9/bcb195562cf830c9e2078757e6d0976f86ede59816ff305e21a2764a4a4cf43e/' > \ - ${WRKSRC}/src/vendor/rand/.cargo-checksum.json.patched - ${CP} -f ${WRKSRC}/src/vendor/libc/.cargo-checksum.json.patched \ - ${WRKSRC}/src/vendor/libc/.cargo-checksum.json - ${CP} -f ${WRKSRC}/src/vendor/rand/.cargo-checksum.json.patched \ - ${WRKSRC}/src/vendor/rand/.cargo-checksum.json + .if ${OPSYS} == "NetBSD" SDIR=${WRKDIR}/scripts; \ ${MKDIR} $${SDIR}; \ @@ -314,9 +306,6 @@ MAKE_ENV+= PKGSRC_HAVE_LIBCPP=yes .endif pre-build: pre-build-fix -# Requires libssh2 defines only available in master. - ${CP} -f ${WRKSRC}/src/vendor/libssh2-sys/libssh2/include/libssh2.h \ - ${BUILDLINK_DIR}/include/ .if ${OPSYS} == "NetBSD" && !empty(PKGSRC_COMPILER:Mclang) && !exists(/lib/libgcc_s.so) cp ${FILESDIR}/libgcc_s.so.1 ${RUST_BOOTSTRAP_PATH}/lib/. .endif diff --git a/lang/rust/distinfo b/lang/rust/distinfo index 51e09e0eb34f..081f49144e5c 100644 --- a/lang/rust/distinfo +++ b/lang/rust/distinfo @@ -1,45 +1,29 @@ -$NetBSD: distinfo,v 1.51 2019/01/05 23:29:40 tnn Exp $ +$NetBSD: distinfo,v 1.52 2019/01/19 12:44:08 ryoon Exp $ -SHA1 (rust-1.30.0-x86_64-sun-solaris.tar.gz) = d1da4a02bdbb9a46587bc64d4b7987bb3f1aaeab -RMD160 (rust-1.30.0-x86_64-sun-solaris.tar.gz) = 0670575ad4eb63f86d34299104f451463e5fc070 -SHA512 (rust-1.30.0-x86_64-sun-solaris.tar.gz) = ca7f08aba3b22715052e5939a99c7814ae66b975b1366495a78ad46fc01ee449ca13ee775152ad71fb0ef40446fd93ecefc7acd369238ad15ccf24ae818473ee -Size (rust-1.30.0-x86_64-sun-solaris.tar.gz) = 197622332 bytes -SHA1 (rust-1.30.1-i686-apple-darwin.tar.gz) = 5e911882faca44681f49876cce453cc436d400ff -RMD160 (rust-1.30.1-i686-apple-darwin.tar.gz) = aaafa28fed541f28ac2d73ad8393f4a04837ed19 -SHA512 (rust-1.30.1-i686-apple-darwin.tar.gz) = f08632391ae6092d39fe7968942e7e3fe97f153cf6313f659a625fb9507372c9a3719a89b7a494a63d73ca849bfc76c9453fa0da317c0a27c6bfcd1e7254a8b2 -Size (rust-1.30.1-i686-apple-darwin.tar.gz) = 206100702 bytes -SHA1 (rust-1.30.1-i686-unknown-freebsd.tar.gz) = 4dd8f72c0e8643213ec7315da8811416c581181a -RMD160 (rust-1.30.1-i686-unknown-freebsd.tar.gz) = 48a95ca0b93215530010a2929a3a8e3be464d3c3 -SHA512 (rust-1.30.1-i686-unknown-freebsd.tar.gz) = b5993df1a13940f6de849da5aa1c4e20c4aba44ac09ae3c41ad042f59c200042273b3c1dc44b2b849a3eaaf3b501a49b29fbb01c00125ba30dae7a6209081420 -Size (rust-1.30.1-i686-unknown-freebsd.tar.gz) = 168574157 bytes -SHA1 (rust-1.30.1-i686-unknown-linux-gnu.tar.gz) = 00fee754eb2cd8eb5b778968db1a7fda0de57218 -RMD160 (rust-1.30.1-i686-unknown-linux-gnu.tar.gz) = 52da8a838badef56da4d7590689a3c9b18307906 -SHA512 (rust-1.30.1-i686-unknown-linux-gnu.tar.gz) = 3adadb5210b183964e89cfe23dd13f0a754bfeaa1a9fb319a7763a1a3764632ac7df032723243c99886095a93fbe1129e2ab8bb35ae2f4791908cdf34c691b06 -Size (rust-1.30.1-i686-unknown-linux-gnu.tar.gz) = 234385476 bytes -SHA1 (rust-1.30.1-i686-unknown-netbsd.tar.gz) = b69dc0668f2cccb142de6e2f9677fca48da09592 -RMD160 (rust-1.30.1-i686-unknown-netbsd.tar.gz) = 8ea9ccbbdc4952d4cb8acd3ca6baf0b75c2bba96 -SHA512 (rust-1.30.1-i686-unknown-netbsd.tar.gz) = 71f7a0090bda6b4e59c83e6a03373b535f49fa3ef84ed5ffee07dc6efcb73a923067948cd5e6e30920cba09c62493c368266a5a81dad6b08a78f7f960720b9a2 -Size (rust-1.30.1-i686-unknown-netbsd.tar.gz) = 178607401 bytes -SHA1 (rust-1.30.1-x86_64-apple-darwin.tar.gz) = a5f12d93b7a09f1c2bef77e7bc93439f8d244acc -RMD160 (rust-1.30.1-x86_64-apple-darwin.tar.gz) = e64b687e5906ad5ab91df17ded7141c84fd8633b -SHA512 (rust-1.30.1-x86_64-apple-darwin.tar.gz) = b1cd6ff29d1b70e579ff5c4b67bd837972b305588987197dc9fc61b4a4dfc161af4e4c2b005e99dff58e3159e3a61361e8f62e909532c6984f4301c8e9f8f543 -Size (rust-1.30.1-x86_64-apple-darwin.tar.gz) = 87933392 bytes -SHA1 (rust-1.30.1-x86_64-unknown-freebsd.tar.gz) = bf54b05ef89db6bd730478141cbfe0381d88f30a -RMD160 (rust-1.30.1-x86_64-unknown-freebsd.tar.gz) = 1917b2b3ceb8e4e918a2a56d9da95cb679ea94f4 -SHA512 (rust-1.30.1-x86_64-unknown-freebsd.tar.gz) = c5d651a93b210565fb460684bc570c57d5d381b4cefebff7bab913c3c3ae1cd58971b322a4c40ecedc3ece101357734043686c6ec6030fb3949784073e0ee145 -Size (rust-1.30.1-x86_64-unknown-freebsd.tar.gz) = 171070694 bytes -SHA1 (rust-1.30.1-x86_64-unknown-linux-gnu.tar.gz) = ae268ce40dd6badfff9e9697f88d2c5ab205a2d4 -RMD160 (rust-1.30.1-x86_64-unknown-linux-gnu.tar.gz) = 1a0c1a236021ed79146bd1e3d6ec771daaec2824 -SHA512 (rust-1.30.1-x86_64-unknown-linux-gnu.tar.gz) = cc5365eab1503c2dbeaf93f7d1ed892e82afb58082b95e5bacced764f794cac48aa808bd31dea7f813dde00660baf3fc54a3dd46e808f3482afb2008fe28d654 -Size (rust-1.30.1-x86_64-unknown-linux-gnu.tar.gz) = 236997689 bytes -SHA1 (rust-1.30.1-x86_64-unknown-netbsd.tar.gz) = 36f5db64fff80de6215a2b7299aa5028aecf717a -RMD160 (rust-1.30.1-x86_64-unknown-netbsd.tar.gz) = d99feb41309fd644c05ea4bbf3649f2d4e0d2e99 -SHA512 (rust-1.30.1-x86_64-unknown-netbsd.tar.gz) = cf4fdc7b5ed2851a514d9c1bf6ff789c7a307be2da49e86ac9b126794ca037ae587fb40fe8d080393d1fa4c0ace6144dbb2070c19e8b4b4eaa32fd814abdb167 -Size (rust-1.30.1-x86_64-unknown-netbsd.tar.gz) = 173425702 bytes +SHA1 (rust-1.31.0-x86_64-sun-solaris.tar.gz) = 782763ddcfb58df6d522aa8b66286e01451c6cb5 +RMD160 (rust-1.31.0-x86_64-sun-solaris.tar.gz) = ad93cf10e3b21c63989310b49ea6874520062400 +SHA512 (rust-1.31.0-x86_64-sun-solaris.tar.gz) = 8e437edf54ea8348fd3a31b2ae4e3b695d579b610db8bd6a105da7aa588711d70e945ec5b334788117341ef3c36f90e2adcfde3378e8fe464f1a2043792ab8f6 +Size (rust-1.31.0-x86_64-sun-solaris.tar.gz) = 203261875 bytes SHA1 (rust-1.31.1-armv7-unknown-netbsd-eabihf.tar.gz) = a3f4425d3a4fa2b0521cd87b293192dc87baeb22 RMD160 (rust-1.31.1-armv7-unknown-netbsd-eabihf.tar.gz) = 5eeb1a7eacf4880958068df1d694d2519807464b SHA512 (rust-1.31.1-armv7-unknown-netbsd-eabihf.tar.gz) = 2293f48474201590925c67d8bdb1bbdee4bf18377ac0dc2a9f7c137fb1a5a59626ae3ca68628875c88e4eee8d6e5d82d920830efde780e31c0d26a164c6f7040 Size (rust-1.31.1-armv7-unknown-netbsd-eabihf.tar.gz) = 214284901 bytes +SHA1 (rust-1.31.1-i686-apple-darwin.tar.gz) = 736a750a93d9aff058c492b15b7b3794d5af5378 +RMD160 (rust-1.31.1-i686-apple-darwin.tar.gz) = 30bd8f352b1a3880965177f15bc24ec693f1aac7 +SHA512 (rust-1.31.1-i686-apple-darwin.tar.gz) = 7c3eff5a266d416de1fd0e258c481ca31aeb160f00fdc7b42e2bc167f89ded99a93d2d90cfad1eaa5cb4061be0ca470b816c3debd1322c2be8be67200819508d +Size (rust-1.31.1-i686-apple-darwin.tar.gz) = 210365110 bytes +SHA1 (rust-1.31.1-i686-unknown-freebsd.tar.gz) = 66f3c59575520eae1e70d99bb19a9c854c40fc8f +RMD160 (rust-1.31.1-i686-unknown-freebsd.tar.gz) = 75a0431f94475ffdbd2b5a6b503edfbcc55a5a73 +SHA512 (rust-1.31.1-i686-unknown-freebsd.tar.gz) = 401b707cb239fc0fc34fbf864ede34ef65fde52ecd8de9c2d17820339814685ce73bad51bdd1518bfb43897f051517f09da49c546e9bdf7689b3f0b73fba4526 +Size (rust-1.31.1-i686-unknown-freebsd.tar.gz) = 173412158 bytes +SHA1 (rust-1.31.1-i686-unknown-linux-gnu.tar.gz) = 7c541dff034b661fc7481c032eeca1f555dbeafa +RMD160 (rust-1.31.1-i686-unknown-linux-gnu.tar.gz) = 51642145a07650bbd26f309ec3f69c612177811f +SHA512 (rust-1.31.1-i686-unknown-linux-gnu.tar.gz) = 8dc2cf82f3e2bab237169696ef18c194845a7c5cae2c6ace03f734d296435ebc5295fb25c1de2d57c0d16b4fed40e015f9298710ca1b6037b2d50b79dca6ed3e +Size (rust-1.31.1-i686-unknown-linux-gnu.tar.gz) = 239021825 bytes +SHA1 (rust-1.31.1-i686-unknown-netbsd.tar.gz) = 3c41ebd108df5159e5c81684031cb70cc4b66baf +RMD160 (rust-1.31.1-i686-unknown-netbsd.tar.gz) = cb1f43aa4c843d60eb23ac16f0a90429a312359c +SHA512 (rust-1.31.1-i686-unknown-netbsd.tar.gz) = 1a597905ccbc264fac841c33d9d41fd3828ab6d5efbcf492bf416d787eb9c686e2c9a75d837c5bc2dced722a4ff41cd8e61159af5fa9038912c45ccf4f0320fa +Size (rust-1.31.1-i686-unknown-netbsd.tar.gz) = 183574080 bytes SHA1 (rust-1.31.1-powerpc-unknown-netbsd.tar.gz) = 18673f5548eb8e4aee25a458a83f8cbb6b2acde9 RMD160 (rust-1.31.1-powerpc-unknown-netbsd.tar.gz) = bc39a1b0994e551e439ca019eb04049948d4bec9 SHA512 (rust-1.31.1-powerpc-unknown-netbsd.tar.gz) = 7c24f61c4f6ef9794c03bb079dc8a91a0d5f36d139864ca938edc7b4d8efe31bb73ba8b412ec3d322bae830fb0a079d4ad10673926806a58dab1dcce1a5ae823 @@ -48,42 +32,42 @@ SHA1 (rust-1.31.1-sparc64-unknown-netbsd.tar.gz) = 1930e26264d000538aeb65f478e98 RMD160 (rust-1.31.1-sparc64-unknown-netbsd.tar.gz) = 51c94ee6daee468dae1fa130c45c1a604234222e SHA512 (rust-1.31.1-sparc64-unknown-netbsd.tar.gz) = ec7df6e0e5069c6d5f5e5545c7ebca16430826c9eacc4e23d3b0036de37860d32f970fdfcd4a46d81ccef5d06ee8f8e3ae2e328c2b1c4e81a6bcfb8c7e9cf04d Size (rust-1.31.1-sparc64-unknown-netbsd.tar.gz) = 215736328 bytes -SHA1 (rust-std-1.30.1-i686-apple-darwin.tar.gz) = 6fccebb77050ab0cbc1712f6c405db1b36f5aafd -RMD160 (rust-std-1.30.1-i686-apple-darwin.tar.gz) = ccf93779c04465097067f512ec9ba38c2a6ce02a -SHA512 (rust-std-1.30.1-i686-apple-darwin.tar.gz) = bcd4919e2c19839ef8b53fce7cabf800f09fed11a118649b8e6bdb74f974a1f7f9ac69d8eb2e1dc24ab74dd668aebafc2487936e596447768d474a194b527751 -Size (rust-std-1.30.1-i686-apple-darwin.tar.gz) = 60104773 bytes -SHA1 (rust-std-1.30.1-i686-unknown-freebsd.tar.gz) = 1cc5f5207437b68866879d21ba518af017f4e37b -RMD160 (rust-std-1.30.1-i686-unknown-freebsd.tar.gz) = b6fdfd511fad482ea3b623b8ca67a9e9eedc82d8 -SHA512 (rust-std-1.30.1-i686-unknown-freebsd.tar.gz) = 48b4d6811a30a2ef853637e8ed1fb94d2b0a1e407e3cc1227658c4e40034ff472b7b0ea7eed69e726fb4f2265b356c339c41acb0bcaa34ce246eb87ab9b18cc9 -Size (rust-std-1.30.1-i686-unknown-freebsd.tar.gz) = 67346987 bytes -SHA1 (rust-std-1.30.1-i686-unknown-linux-gnu.tar.gz) = 4c5b376adb98efc86b2b7556e3b447c19d65d954 -RMD160 (rust-std-1.30.1-i686-unknown-linux-gnu.tar.gz) = 8f0a27b7a1e371b5891e8538ed67c0324240d32a -SHA512 (rust-std-1.30.1-i686-unknown-linux-gnu.tar.gz) = 474be4a9b75e150b3f9f048d0d7c0b8a75bfc0d6d26333fe4a842ee0f2cc82813c4765a05474f018a9ead0be154b973a25691dc0947a17693813d9857fe2e92c -Size (rust-std-1.30.1-i686-unknown-linux-gnu.tar.gz) = 68880491 bytes -SHA1 (rust-std-1.30.1-i686-unknown-netbsd.tar.gz) = 63f037ab4a7f0dbe013b2f9dad2b8b1c212cf47e -RMD160 (rust-std-1.30.1-i686-unknown-netbsd.tar.gz) = e5ae5ccc40019d5c94a294eccaa409b454625610 -SHA512 (rust-std-1.30.1-i686-unknown-netbsd.tar.gz) = b0263234adcb9019f2b419fe071fcfe78dd4a66f29634605e19d5fa21d878dd625bd6d7c3de66f554da322ddeca7d77329c3ed1b52b1222cb78bb770bf3834f4 -Size (rust-std-1.30.1-i686-unknown-netbsd.tar.gz) = 69459562 bytes -SHA1 (rust-std-1.30.1-x86_64-apple-darwin.tar.gz) = c77f0cbf73bfe3069ec660d19cb555b6b86cf82f -RMD160 (rust-std-1.30.1-x86_64-apple-darwin.tar.gz) = 3aef3044b7f9bdee087e01a196a2ed109a1690c4 -SHA512 (rust-std-1.30.1-x86_64-apple-darwin.tar.gz) = 98c37d4f41845976c8bba17738a6256061c1e1ed28cc8545be5e961189c44d94a71947f7cdf03dd45636ba3c75ac40b66b98831d188f2d3252b65df6e2e1c9ca -Size (rust-std-1.30.1-x86_64-apple-darwin.tar.gz) = 61537457 bytes -SHA1 (rust-std-1.30.1-x86_64-unknown-freebsd.tar.gz) = 266677d84760c44d21f814f0c60155dace8e1d42 -RMD160 (rust-std-1.30.1-x86_64-unknown-freebsd.tar.gz) = 7eab1711a58295c4b48d74369f0a6ac8b1c9c82f -SHA512 (rust-std-1.30.1-x86_64-unknown-freebsd.tar.gz) = f7bad17a45d3f78c09dc3313ac9642cb70a1a3c8179ca3d0c2d9963dccbbb08271c1dd925582fe591145c163648ac913ebd22adf20b5372cdd98d1ee3111ebcd -Size (rust-std-1.30.1-x86_64-unknown-freebsd.tar.gz) = 67111799 bytes -SHA1 (rust-std-1.30.1-x86_64-unknown-linux-gnu.tar.gz) = 905249685a96c381730099e3509fef3de21bb53f -RMD160 (rust-std-1.30.1-x86_64-unknown-linux-gnu.tar.gz) = f39d49ea598142d63b015c8ee038d552d0288968 -SHA512 (rust-std-1.30.1-x86_64-unknown-linux-gnu.tar.gz) = 0baa547c01d0ec0a1e258b254b09e3c0252f393f71f21d7c4ed227bad2fbabe0a51591c7c87887e34a1e9ac2633f265b4064802680f03dc8916328cce663de8c -Size (rust-std-1.30.1-x86_64-unknown-linux-gnu.tar.gz) = 70634859 bytes -SHA1 (rust-std-1.30.1-x86_64-unknown-netbsd.tar.gz) = 881829aa871752c5d10fd294ba4f55c7de5199c5 -RMD160 (rust-std-1.30.1-x86_64-unknown-netbsd.tar.gz) = d3688a289d86139acaba9b0150fa5af5c755fc7b -SHA512 (rust-std-1.30.1-x86_64-unknown-netbsd.tar.gz) = c83237c8c2e1aebb38f64aad14d48dbbda908e0727b49f56251b5d951faae84dc82a77612062e31f91979b84cb9564b645efc0c0e0c04f6774b4907453fd1096 -Size (rust-std-1.30.1-x86_64-unknown-netbsd.tar.gz) = 69397670 bytes +SHA1 (rust-1.31.1-x86_64-apple-darwin.tar.gz) = fabc4be533738609b70d5ba045a62ded7452a2c7 +RMD160 (rust-1.31.1-x86_64-apple-darwin.tar.gz) = 88633cd8e6914d09ce6a7df21dc6b951d9c1b301 +SHA512 (rust-1.31.1-x86_64-apple-darwin.tar.gz) = cc5bbdb15575364d035e88cdbcc6d20e2ab631c49162e63054cc996f1afd145ef88c6f7f47f31c9f4453c702a2e681ed46cd66ba3982bb06f766633af91aacab +Size (rust-1.31.1-x86_64-apple-darwin.tar.gz) = 215547679 bytes +SHA1 (rust-1.31.1-x86_64-unknown-freebsd.tar.gz) = 8d940ba8781174cb68a7e48d2e7673095cd2c5b4 +RMD160 (rust-1.31.1-x86_64-unknown-freebsd.tar.gz) = be00a33406bc4504adb321849e31143d3ceb94f8 +SHA512 (rust-1.31.1-x86_64-unknown-freebsd.tar.gz) = c74dbeaf71ec9d3a9e6cd7d4752688f4b8598207f3bebb28d1b3775f7a8a5a155f6b7575636b5c9c85db78b8573a66c93f5a435b22139dbf203f4ae0c6da3b35 +Size (rust-1.31.1-x86_64-unknown-freebsd.tar.gz) = 176310189 bytes +SHA1 (rust-1.31.1-x86_64-unknown-linux-gnu.tar.gz) = 6726f6e566b3af58f43ea65cf8f9a7c05210dc7a +RMD160 (rust-1.31.1-x86_64-unknown-linux-gnu.tar.gz) = 6c8d37b4e174984fbdc3e4966ba36bf848f958e4 +SHA512 (rust-1.31.1-x86_64-unknown-linux-gnu.tar.gz) = 918eb9599498da0778261e4f6da1c00ca144a70425d5b44747ffe2b5b46dd5ec3340ef00b90836688002ac7eb19ce1cbbaa2729e640425d0dd00a64e4f890b5e +Size (rust-1.31.1-x86_64-unknown-linux-gnu.tar.gz) = 241968693 bytes +SHA1 (rust-1.31.1-x86_64-unknown-netbsd.tar.gz) = dabac07fa32d672d2e42cc740e79591e06c510ab +RMD160 (rust-1.31.1-x86_64-unknown-netbsd.tar.gz) = 725e6f1b0218d4a568aadfc655d713875d78b6f7 +SHA512 (rust-1.31.1-x86_64-unknown-netbsd.tar.gz) = 68f1114e5573a18e860a79792797caea17e7c8d4e073a9a89f589f54614eb03137d17bdd7103e7bab84a7af2e7b7d6ee2adfb9f8cda699dfce34b45a9c920903 +Size (rust-1.31.1-x86_64-unknown-netbsd.tar.gz) = 178634165 bytes SHA1 (rust-std-1.31.1-armv7-unknown-netbsd-eabihf.tar.gz) = be493285977fdc40c45bf495a223fdd247056ecb RMD160 (rust-std-1.31.1-armv7-unknown-netbsd-eabihf.tar.gz) = 628a7b669a2578db6b7a4ab02b9c8845698d1500 SHA512 (rust-std-1.31.1-armv7-unknown-netbsd-eabihf.tar.gz) = 26a5ad3b3285bd4d3b2c778568ca8a8c66e60c86f10e61d9e04d60103dbca28839f79cfd7835472a65a3fa731ba127ea1bd7a45d41b642a390f31171aea75ed4 Size (rust-std-1.31.1-armv7-unknown-netbsd-eabihf.tar.gz) = 71603203 bytes +SHA1 (rust-std-1.31.1-i686-apple-darwin.tar.gz) = 5a831385445d2e688a1cbb50aa8db2cd549aeddc +RMD160 (rust-std-1.31.1-i686-apple-darwin.tar.gz) = 8f2e8545a58a5ff2488cbb6e94bc7b8af061397d +SHA512 (rust-std-1.31.1-i686-apple-darwin.tar.gz) = 4cb322e3d0926f1dc9faefe606437062be74726379d2f938f143d2fc44d55e09b1ed3dde3ef40c8f14b4b80118a47a8657bd0afea5bf498d37150c2d27f43133 +Size (rust-std-1.31.1-i686-apple-darwin.tar.gz) = 61971130 bytes +SHA1 (rust-std-1.31.1-i686-unknown-freebsd.tar.gz) = b599a31a630a23762c0ccebf8b8ddda8416652aa +RMD160 (rust-std-1.31.1-i686-unknown-freebsd.tar.gz) = 509451a92d4e9f2ebdb52f38b4e6302335e07aab +SHA512 (rust-std-1.31.1-i686-unknown-freebsd.tar.gz) = 3b7c343d2b6b3ccc89d5334906809372531b7ba9e485c07a7b6f99f6fc2063470f85c007803f4666f19d07a2644221c542ac8061a641b86f784d8086206a1417 +Size (rust-std-1.31.1-i686-unknown-freebsd.tar.gz) = 69465005 bytes +SHA1 (rust-std-1.31.1-i686-unknown-linux-gnu.tar.gz) = 9668ee472f17b8b7bbcc0f56c1af5500f99db784 +RMD160 (rust-std-1.31.1-i686-unknown-linux-gnu.tar.gz) = c95918e1e897be35e03f5a4569dd84e429ad874b +SHA512 (rust-std-1.31.1-i686-unknown-linux-gnu.tar.gz) = 8a36cbfddfdaa0ce1f29fda58a97749a4a3cc50c64bf67b520e6546075e806c1a3898cbeb63b3b14648e21b9de015984a7b8cadcb0328a0bf23e27e6cb26c0c9 +Size (rust-std-1.31.1-i686-unknown-linux-gnu.tar.gz) = 71084417 bytes +SHA1 (rust-std-1.31.1-i686-unknown-netbsd.tar.gz) = 6e318eac9ff2584af598b5c12eeb26bb3dba0c89 +RMD160 (rust-std-1.31.1-i686-unknown-netbsd.tar.gz) = 0ec9efb80ef2a1b06b9a3ce543d44f6c3cc5534c +SHA512 (rust-std-1.31.1-i686-unknown-netbsd.tar.gz) = 4649f9537ab59b993418b0939714228e552626cb76547dfb46ec0f5951e17440e50a840a11727e10f0a16a3f23d936a75c4332880067964daa1fe06488b712e0 +Size (rust-std-1.31.1-i686-unknown-netbsd.tar.gz) = 71659508 bytes SHA1 (rust-std-1.31.1-powerpc-unknown-netbsd.tar.gz) = 98fc92ba3cf21147e4f27babe438e786194cba98 RMD160 (rust-std-1.31.1-powerpc-unknown-netbsd.tar.gz) = 7053db7cbf8dfd3188c7685f0aa6052801c3d16c SHA512 (rust-std-1.31.1-powerpc-unknown-netbsd.tar.gz) = a95c793c95e765a75e377e73e555387ed9cd71dac2c227747269b476eb9ad25b2f6bc12db46b283f1a6722a1f531c550dd8a9e6f8fd81ec4013042485d3e17a3 @@ -92,19 +76,34 @@ SHA1 (rust-std-1.31.1-sparc64-unknown-netbsd.tar.gz) = d20f6df638543f59771a7cd82 RMD160 (rust-std-1.31.1-sparc64-unknown-netbsd.tar.gz) = 85f1b171abc07d624b44ae2ba6b6b3e4fe1cf27b SHA512 (rust-std-1.31.1-sparc64-unknown-netbsd.tar.gz) = 06083d8a0cb7bbde28362edd7b47f6b3253529733bd03ca45b5f4e9856a8850a7fe890db42d7c2898512c2466abc53c7b8ca48b84327a8e24604717179eefaa9 Size (rust-std-1.31.1-sparc64-unknown-netbsd.tar.gz) = 71836855 bytes -SHA1 (rustc-1.31.1-src.tar.gz) = b4276b400bade8e3fc13aed023c5356ec28bdc80 -RMD160 (rustc-1.31.1-src.tar.gz) = 5c3ffa2ab47b20755e6acd5d98fbd692627b2158 -SHA512 (rustc-1.31.1-src.tar.gz) = 76ca238c40694abab4982f4b788a0da34bbb3d8a6e4adb50b0b9138876407ac2cb4fc39cde057b8fa32729c543c5977d392167e96b82f76a01af31eaafe463cf -Size (rustc-1.31.1-src.tar.gz) = 151163848 bytes -SHA1 (patch-src_bootstrap_bin_rustc.rs) = 0abf893090a6053e01fd658096d9a2b5b8c144da +SHA1 (rust-std-1.31.1-x86_64-apple-darwin.tar.gz) = e2152a2124462b564ba874d69af4673cf3cc7489 +RMD160 (rust-std-1.31.1-x86_64-apple-darwin.tar.gz) = 3720e893daa003532a3df322f4c206a3368efc7f +SHA512 (rust-std-1.31.1-x86_64-apple-darwin.tar.gz) = ad55f03fce5b4eed03ea606c43f44d683895173efa1c4a1e818b7eb4fe5ec2de022ddd8d6e8e0b65485d105713cd49b766f92df11a023e0e2e42342837c658cf +Size (rust-std-1.31.1-x86_64-apple-darwin.tar.gz) = 63481869 bytes +SHA1 (rust-std-1.31.1-x86_64-unknown-freebsd.tar.gz) = f6fa2d35b20695d884737bf1df7b6283394d1d7f +RMD160 (rust-std-1.31.1-x86_64-unknown-freebsd.tar.gz) = 9fb55ddffa3b8630ccd3e2b3370bc7bccc4cfe34 +SHA512 (rust-std-1.31.1-x86_64-unknown-freebsd.tar.gz) = 62ec2388111546f747a1ee3869dc0ce8923b6526b0660ec8b92178ef597ac2152ae4657e843d823f032fd50088aebfc3f9a86e5c2583129df8a72f8b00fc0b64 +Size (rust-std-1.31.1-x86_64-unknown-freebsd.tar.gz) = 69337097 bytes +SHA1 (rust-std-1.31.1-x86_64-unknown-linux-gnu.tar.gz) = f855412d5db922164c311864b5bcecd1bb936388 +RMD160 (rust-std-1.31.1-x86_64-unknown-linux-gnu.tar.gz) = 14d87fab18ac23a313ce60d0dd5d7ced50594320 +SHA512 (rust-std-1.31.1-x86_64-unknown-linux-gnu.tar.gz) = 0b7b500e6670d33e770138217deecc51465c8b8433d7d3580eb4724ab310022fadc7180adb31eacfed545569252577464a4e130699834a5e9e33dd3e52907bcc +Size (rust-std-1.31.1-x86_64-unknown-linux-gnu.tar.gz) = 72964452 bytes +SHA1 (rust-std-1.31.1-x86_64-unknown-netbsd.tar.gz) = b957ce4272ec065d206e0501ff4a1bda5a6e81a3 +RMD160 (rust-std-1.31.1-x86_64-unknown-netbsd.tar.gz) = b8b5a2fd88afbcd696cc0ecc46bbbc15a68fd44d +SHA512 (rust-std-1.31.1-x86_64-unknown-netbsd.tar.gz) = a30bfcc95e3e7b5bc019f562b6da4a160864072a325b147c7db86a553edac6d332bc7d293ba0b06cdef605ae3ada4690e9229fffe2db0492d78bd2a991ddad51 +Size (rust-std-1.31.1-x86_64-unknown-netbsd.tar.gz) = 71728636 bytes +SHA1 (rustc-1.32.0-src.tar.gz) = 4a8a9e1158b36571be12c7d86c358691d5febf22 +RMD160 (rustc-1.32.0-src.tar.gz) = a6780274c27c78722e0615a5daee71f471690c7f +SHA512 (rustc-1.32.0-src.tar.gz) = 9bca5702fe4ea515b4401cf200cf472d3b24dd6c93bd4a783a4cd6c473a2e9dc715b642672e1c940770d2bab860633ffe0b8cec6fbbfc737e23aa2a21d6cd00a +Size (rustc-1.32.0-src.tar.gz) = 158503827 bytes +SHA1 (patch-src_bootstrap_bin_rustc.rs) = 5e6b0cb25401db4fef6e74f73764e69f3c09569c SHA1 (patch-src_bootstrap_bootstrap.py) = 5b886b95857bf019c2e37cb380e6905cb444b756 SHA1 (patch-src_bootstrap_builder.rs) = e02356401417f8e8296a5fe27c68072f698f0190 -SHA1 (patch-src_bootstrap_lib.rs) = d86e173b931099730a4f18d044d7977c89f87b91 +SHA1 (patch-src_bootstrap_lib.rs) = bc23743f1b9c4ad3d7557b4fdf8a55976ca7f417 SHA1 (patch-src_libbacktrace_configure) = b2c1e9b93a99408aad42ab9f1af27704cc81bdd8 -SHA1 (patch-src_liblibc_src_unix_bsd_netbsdlike_netbsd_mod.rs) = e5b564bb247094cc8e4e6935a02262b3385cb7e6 SHA1 (patch-src_liblibc_src_unix_solaris_mod.rs) = aeb7c22995e33c700ce3ea4336368a1fd08120e1 SHA1 (patch-src_librustc__llvm_build.rs) = a56bf5435e40bb012641ada6b20256901a1073fb -SHA1 (patch-src_libstd_build.rs) = 1edbf87339bd88e3178d4fa2fc408a6e802ed488 +SHA1 (patch-src_libstd_build.rs) = 2334879e4b730014de08bb2dfff1a643292a630e SHA1 (patch-src_libstd_sys_unix_thread.rs) = 46ef46365658e2f895bd3dde9c74f352890e9ccc SHA1 (patch-src_libsyntax__pos_span__encoding.rs) = c891cffab8ae47b13b3b391ddd1a6c62ee2b38f3 SHA1 (patch-src_libunwind_build.rs) = 74e2101f0cd78ca68b0a9d14355e20dcaea66100 @@ -117,4 +116,3 @@ SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 76e77c2c49baf8c951ed8d22 SHA1 (patch-src_tools_rls_src_cmd.rs) = 754bfb8806e209cb0ef01690b48bf4b145017ab9 SHA1 (patch-src_tools_rls_src_server_io.rs) = 74b90c1aeb70b0c3a20709145d6568ddf4647877 SHA1 (patch-src_tools_rust-installer_install-template.sh) = f2ec6dced2be1fa23773d5827503ad07d0913dc2 -SHA1 (patch-src_vendor_rand_src_rngs_os.rs) = 318c9e0ed77f83bb34f5512638545ff16844e8fd diff --git a/lang/rust/patches/patch-src_bootstrap_bin_rustc.rs b/lang/rust/patches/patch-src_bootstrap_bin_rustc.rs index 6fe4600c4dc9..e093cefc8386 100644 --- a/lang/rust/patches/patch-src_bootstrap_bin_rustc.rs +++ b/lang/rust/patches/patch-src_bootstrap_bin_rustc.rs @@ -1,13 +1,13 @@ -$NetBSD: patch-src_bootstrap_bin_rustc.rs,v 1.4 2018/09/14 10:04:43 jperkin Exp $ +$NetBSD: patch-src_bootstrap_bin_rustc.rs,v 1.5 2019/01/19 12:44:08 ryoon Exp $ * Set RPATH for pkgsrc wrapper ---- src/bootstrap/bin/rustc.rs.orig 2018-09-11 03:37:38.000000000 +0000 +--- src/bootstrap/bin/rustc.rs.orig 2019-01-16 09:30:27.000000000 +0000 +++ src/bootstrap/bin/rustc.rs -@@ -233,7 +233,7 @@ fn main() { - cmd.arg("-Z").arg("osx-rpath-install-name"); - Some("-Wl,-rpath,@loader_path/../lib") - } else if !target.contains("windows") && !target.contains("wasm32") { +@@ -237,7 +237,7 @@ fn main() { + } else if !target.contains("windows") && + !target.contains("wasm32") && + !target.contains("fuchsia") { - Some("-Wl,-rpath,$ORIGIN/../lib") + Some("-Wl,-rpath,@PREFIX@/lib") } else { diff --git a/lang/rust/patches/patch-src_bootstrap_lib.rs b/lang/rust/patches/patch-src_bootstrap_lib.rs index c6d5db468917..723901b68659 100644 --- a/lang/rust/patches/patch-src_bootstrap_lib.rs +++ b/lang/rust/patches/patch-src_bootstrap_lib.rs @@ -1,19 +1,19 @@ -$NetBSD: patch-src_bootstrap_lib.rs,v 1.3 2018/03/02 05:59:18 triaxx Exp $ +$NetBSD: patch-src_bootstrap_lib.rs,v 1.4 2019/01/19 12:44:08 ryoon Exp $ Don't filter out optimization flags. FreeBSD has a particular C++ runtime library name ---- src/bootstrap/lib.rs.orig 2018-02-12 18:51:18.000000000 +0000 +--- src/bootstrap/lib.rs.orig 2019-01-16 09:30:27.000000000 +0000 +++ src/bootstrap/lib.rs -@@ -632,7 +632,6 @@ impl Build { +@@ -779,7 +779,6 @@ impl Build { // cc-rs because the build scripts will determine that for themselves. let mut base = self.cc[&target].args().iter() .map(|s| s.to_string_lossy().into_owned()) - .filter(|s| !s.starts_with("-O") && !s.starts_with("/O")) - .collect::>(); + .collect::>(); // If we're compiling on macOS then we add a few unconditional flags -@@ -643,6 +642,11 @@ impl Build { +@@ -790,6 +789,11 @@ impl Build { base.push("-stdlib=libc++".into()); } diff --git a/lang/rust/patches/patch-src_liblibc_src_unix_bsd_netbsdlike_netbsd_mod.rs b/lang/rust/patches/patch-src_liblibc_src_unix_bsd_netbsdlike_netbsd_mod.rs deleted file mode 100644 index e1825fae18d6..000000000000 --- a/lang/rust/patches/patch-src_liblibc_src_unix_bsd_netbsdlike_netbsd_mod.rs +++ /dev/null @@ -1,137 +0,0 @@ -$NetBSD: patch-src_liblibc_src_unix_bsd_netbsdlike_netbsd_mod.rs,v 1.1 2018/10/31 16:30:44 martin Exp $ - -Temporary patch untill - - https://github.com/rust-lang/libc/pull/1108 - -gets merged upstream. -Fixes mutex/pthread types for some NetBSD architectures. - ---- src/liblibc/src/unix/bsd/netbsdlike/netbsd/mod.rs.orig 2018-10-24 22:01:28.000000000 +0200 -+++ src/liblibc/src/unix/bsd/netbsdlike/netbsd/mod.rs 2018-10-30 13:26:45.473542210 +0100 -@@ -9,6 +9,21 @@ pub type fsfilcnt_t = ::uint64_t; - pub type idtype_t = ::c_int; - pub type mqd_t = ::c_int; - -+cfg_if! { -+ if #[cfg(any(target_arch = "aarch64", -+ target_arch = "sparc", target_arch = "sparc64", -+ target_arch = "x86", target_arch = "x86_64"))] { -+ type __cpu_simple_lock_t = ::c_uchar; -+ } else if #[cfg(any(target_arch = "arm", target_arch = "powerpc", -+ target_arch = "powerpc64"))] { -+ type __cpu_simple_lock_t = ::c_int; -+ } else if #[cfg(any(target_arch = "mips", target_arch = "mips64"))] { -+ type __cpu_simple_lock_t = ::c_uint; -+ } else { -+ // Unknown target_arch -+ } -+} -+ - s! { - pub struct aiocb { - pub aio_offset: ::off_t, -@@ -160,9 +175,13 @@ s! { - - pub struct pthread_mutex_t { - ptm_magic: ::c_uint, -- ptm_errorcheck: ::c_uchar, -+ ptm_errorcheck: __cpu_simple_lock_t, -+ #[cfg(any(target_arch = "sparc", target_arch = "sparc64", -+ target_arch = "x86", target_arch = "x86_64"))] - ptm_pad1: [u8; 3], -- ptm_interlock: ::c_uchar, -+ ptm_interlock: __cpu_simple_lock_t, -+ #[cfg(any(target_arch = "sparc", target_arch = "sparc64", -+ target_arch = "x86", target_arch = "x86_64"))] - ptm_pad2: [u8; 3], - ptm_owner: ::pthread_t, - ptm_waiters: *mut u8, -@@ -182,7 +201,7 @@ s! { - - pub struct pthread_cond_t { - ptc_magic: ::c_uint, -- ptc_lock: ::c_uchar, -+ ptc_lock: __cpu_simple_lock_t, - ptc_waiters_first: *mut u8, - ptc_waiters_last: *mut u8, - ptc_mutex: *mut ::pthread_mutex_t, -@@ -196,7 +215,7 @@ s! { - - pub struct pthread_rwlock_t { - ptr_magic: ::c_uint, -- ptr_interlock: ::c_uchar, -+ ptr_interlock: __cpu_simple_lock_t, - ptr_rblocked_first: *mut u8, - ptr_rblocked_last: *mut u8, - ptr_wblocked_first: *mut u8, -@@ -692,17 +711,33 @@ pub const FD_SETSIZE: usize = 0x100; - - pub const ST_NOSUID: ::c_ulong = 8; - --pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t { -- ptm_magic: 0x33330003, -- ptm_errorcheck: 0, -- ptm_interlock: 0, -- ptm_waiters: 0 as *mut _, -- ptm_owner: 0, -- ptm_pad1: [0; 3], -- ptm_pad2: [0; 3], -- ptm_recursed: 0, -- ptm_spare2: 0 as *mut _, --}; -+cfg_if! { -+ if #[cfg(any(target_arch = "sparc", target_arch = "sparc64", -+ target_arch = "x86", target_arch = "x86_64"))] { -+ pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t { -+ ptm_magic: 0x33330003, -+ ptm_errorcheck: 0, -+ ptm_interlock: 0, -+ ptm_waiters: 0 as *mut _, -+ ptm_owner: 0, -+ ptm_pad1: [0; 3], -+ ptm_pad2: [0; 3], -+ ptm_recursed: 0, -+ ptm_spare2: 0 as *mut _, -+ }; -+ } else { -+ pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = pthread_mutex_t { -+ ptm_magic: 0x33330003, -+ ptm_errorcheck: 0, -+ ptm_interlock: 0, -+ ptm_waiters: 0 as *mut _, -+ ptm_owner: 0, -+ ptm_recursed: 0, -+ ptm_spare2: 0 as *mut _, -+ }; -+ } -+} -+ - pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = pthread_cond_t { - ptc_magic: 0x55550005, - ptc_lock: 0, -@@ -969,6 +1004,15 @@ pub const SOCK_NONBLOCK: ::c_int = 0x200 - - pub const SIGSTKSZ : ::size_t = 40960; - -+pub const PT_DUMPCORE: ::c_int = 12; -+pub const PT_LWPINFO: ::c_int = 13; -+pub const PT_SYSCALL: ::c_int = 14; -+pub const PT_SYSCALLEMU: ::c_int = 15; -+pub const PT_SET_EVENT_MASK: ::c_int = 16; -+pub const PT_GET_EVENT_MASK: ::c_int = 17; -+pub const PT_GET_PROCESS_STATE: ::c_int = 18; -+pub const PT_FIRSTMACH: ::c_int = 32; -+ - // dirfd() is a macro on netbsd to access - // the first field of the struct where dirp points to: - // http://cvsweb.netbsd.org/bsdweb.cgi/src/include/dirent.h?rev=1.36 -@@ -1097,6 +1141,8 @@ extern { - base: ::locale_t) -> ::locale_t; - #[link_name = "__settimeofday50"] - pub fn settimeofday(tv: *const ::timeval, tz: *const ::c_void) -> ::c_int; -+ -+ pub fn dup3(src: ::c_int, dst: ::c_int, flags: ::c_int) -> ::c_int; - } - - #[link(name = "util")] diff --git a/lang/rust/patches/patch-src_libstd_build.rs b/lang/rust/patches/patch-src_libstd_build.rs index 1e9f9415d90a..a1235039f476 100644 --- a/lang/rust/patches/patch-src_libstd_build.rs +++ b/lang/rust/patches/patch-src_libstd_build.rs @@ -1,20 +1,21 @@ -$NetBSD: patch-src_libstd_build.rs,v 1.2 2018/10/13 10:03:37 he Exp $ +$NetBSD: patch-src_libstd_build.rs,v 1.3 2019/01/19 12:44:08 ryoon Exp $ SunOS support: - Support PKGSRC_USE_SSP (ugly for now). - Add libumem support. - Add libexecinfo for backtrace(). ---- src/libstd/build.rs.orig 2017-10-09 20:04:51.000000000 +0000 +--- src/libstd/build.rs.orig 2019-01-16 09:30:27.000000000 +0000 +++ src/libstd/build.rs -@@ -43,12 +43,16 @@ fn main() { +@@ -42,6 +42,7 @@ fn main() { + println!("cargo:rustc-link-lib=execinfo"); println!("cargo:rustc-link-lib=pthread"); - } else if target.contains("dragonfly") || target.contains("bitrig") || - target.contains("netbsd") || target.contains("openbsd") { + } else if target.contains("netbsd") { + println!("cargo:rustc-link-lib=execinfo"); println!("cargo:rustc-link-lib=pthread"); - } else if target.contains("solaris") { - println!("cargo:rustc-link-lib=socket"); + println!("cargo:rustc-link-lib=rt"); + } else if target.contains("dragonfly") || target.contains("bitrig") || +@@ -52,6 +53,9 @@ fn main() { println!("cargo:rustc-link-lib=posix4"); println!("cargo:rustc-link-lib=pthread"); println!("cargo:rustc-link-lib=resolv"); diff --git a/lang/rust/patches/patch-src_vendor_rand_src_rngs_os.rs b/lang/rust/patches/patch-src_vendor_rand_src_rngs_os.rs deleted file mode 100644 index 03b8790ed98f..000000000000 --- a/lang/rust/patches/patch-src_vendor_rand_src_rngs_os.rs +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_vendor_rand_src_rngs_os.rs,v 1.1 2018/10/31 15:53:18 jperkin Exp $ - -Explicitly disable getrandom support on SunOS, the test fails. -https://github.com/rust-random/rand/issues/637 - ---- src/vendor/rand/src/rngs/os.rs.orig 2018-10-24 21:38:28.000000000 +0000 -+++ src/vendor/rand/src/rngs/os.rs -@@ -675,6 +675,7 @@ mod imp { - } - - fn getrandom(buf: &mut [u8], blocking: bool) -> libc::c_long { -+ return -1; - extern "C" { - fn syscall(number: libc::c_long, ...) -> libc::c_long; - }