[pkgsrc/trunk]: pkgsrc/lang/rust Bump bootstrap version to 1.38.0 for NetBSD/...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/lang/rust Bump bootstrap version to 1.38.0 for NetBSD/...
From: he <he%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 12:12:29 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/92cf59951a11
branches:  trunk
changeset: 403476:92cf59951a11
user:      he <he%pkgsrc.org@localhost>
date:      Sun Oct 27 18:34:27 2019 +0000

description:
Bump bootstrap version to 1.38.0 for NetBSD/aarch64 (9.0),
NetBSD/amd64 (8.0) and NetBSD/i386 (8.0).  These bootstraps do
not use the pkgsrc llvm, i.e. are built with the rust-llvm option.

Disable warnings as fatal errors; 1.38.0 building 1.38.0 produces
warnings which would otherwise be fatal, ref.
  https://github.com/rust-lang/rust/issues/65722

Also, revert back to BUILD_TARGET=build which I mistakenly changed
to "dist" previously.

Bump PKGVERSION.

diffstat:

 lang/rust/Makefile                           |  13 +++---
 lang/rust/distinfo                           |  52 ++++++++++++++--------------
 lang/rust/patches/patch-src_bootstrap_lib.rs |  18 ++++++++-
 3 files changed, 48 insertions(+), 35 deletions(-)

diffs (192 lines):

diff -r cad4b82cd818 -r 92cf59951a11 lang/rust/Makefile
--- a/lang/rust/Makefile        Sun Oct 27 18:21:01 2019 +0000
+++ b/lang/rust/Makefile        Sun Oct 27 18:34:27 2019 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.118 2019/10/24 17:34:10 jperkin Exp $
+# $NetBSD: Makefile,v 1.119 2019/10/27 18:34:27 he Exp $
 
 DISTNAME=      rustc-1.38.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  http://static.rust-lang.org/dist/
 
@@ -43,8 +44,8 @@
 #CONFIGURE_ARGS+=      --jemalloc-root=${BUILDLINK_PREFIX.jemalloc}/lib
 
 # Use "dist" build target for cross compile of bootstrap
-BUILD_TARGET=          dist
-#BUILD_TARGET=         build
+#BUILD_TARGET=         dist
+BUILD_TARGET=          build
 
 # The gcc-wrap / c++-wrap script takes CROSS_ROOT environment variable
 # to do a cross-build.  The wrapper script assumes dest/ and tools/
@@ -207,7 +208,7 @@
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=       1.37.0
+RUST_STAGE0_VER=       1.38.0
 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
@@ -223,7 +224,7 @@
        ${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.37.0
+RUST_STAGE0_VER=       1.38.0
 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
@@ -241,7 +242,7 @@
 pre-build-fix:
 .endif
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=       1.37.0
+RUST_STAGE0_VER=       1.38.0
 RUST_ARCH=             aarch64-unknown-netbsd
 RUST_STAGE0:=          rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=      rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
diff -r cad4b82cd818 -r 92cf59951a11 lang/rust/distinfo
--- a/lang/rust/distinfo        Sun Oct 27 18:21:01 2019 +0000
+++ b/lang/rust/distinfo        Sun Oct 27 18:34:27 2019 +0000
@@ -1,13 +1,9 @@
-$NetBSD: distinfo,v 1.89 2019/10/02 12:51:43 he Exp $
+$NetBSD: distinfo,v 1.90 2019/10/27 18:34:27 he Exp $
 
 SHA1 (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 91517fa95f954427c627cf63eb7c518abd068f3e
 RMD160 (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 06a3d922b27aac2deb570301542897a131b47cd0
 SHA512 (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 27f7fb0e4a4522b24f04c7f6b578c8717908978ab485c525adbc95716860a958f2c42d4148d81fd41ab0e593d3baae6a1ffc6767ed24879df7c2aa6d8bf14683
 Size (rust-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 243045630 bytes
-SHA1 (rust-1.37.0-aarch64-unknown-netbsd.tar.gz) = e37bd4f1ea481382a1b68bfae16ad626509a636e
-RMD160 (rust-1.37.0-aarch64-unknown-netbsd.tar.gz) = a125f7b3924899ff70632bb347ff3d324354aabd
-SHA512 (rust-1.37.0-aarch64-unknown-netbsd.tar.gz) = 8fc80e6c6a9068d191ce9db34abf4b40a7a9fb570672c5bee47b379a6e554ccb24c6ec9b40d7eabefee1e5d0cdae85edd0cde3ada1d350c1a51d31a5c3d83021
-Size (rust-1.37.0-aarch64-unknown-netbsd.tar.gz) = 172961074 bytes
 SHA1 (rust-1.37.0-i686-apple-darwin.tar.gz) = 5af3055bfe24ec7d4d9040a2f0af6f60c0403ffe
 RMD160 (rust-1.37.0-i686-apple-darwin.tar.gz) = bcf93023bad85ef1f16efd337685d4fe907e9e41
 SHA512 (rust-1.37.0-i686-apple-darwin.tar.gz) = b63b924b54618f1aa81556a7a7a6f43a2cef7425ead01d2d43d11a173f27f48a3a45b581899010efc54669598d79282e7be9d2db9b78a4fa88ed056150820546
@@ -20,10 +16,6 @@
 RMD160 (rust-1.37.0-i686-unknown-linux-gnu.tar.gz) = 3da67587ea18c46a321cbf82b2f924eb2b0deb5e
 SHA512 (rust-1.37.0-i686-unknown-linux-gnu.tar.gz) = e4db8a47dd482ac4d0476a285d2398d9f63518e1504bb56cb00eb247ae9c8199950b4a929b0d0d0a43290380514cf66f2ead5307a31c15cbabee41936cb3d41e
 Size (rust-1.37.0-i686-unknown-linux-gnu.tar.gz) = 285246301 bytes
-SHA1 (rust-1.37.0-i686-unknown-netbsd.tar.gz) = 915493342e8e66c8a763d2756e0b6df0cfd3368e
-RMD160 (rust-1.37.0-i686-unknown-netbsd.tar.gz) = b99df44472400b9cf3ffd1616c681a951246ca63
-SHA512 (rust-1.37.0-i686-unknown-netbsd.tar.gz) = 7bf6a01deb348b44f08ad61ee8edad14fe9255eb25a176708e72450635a7e47828ae67c349828c6141726aad6d5f43e67056a28ea33c49e0d6a57ed86e9c87fb
-Size (rust-1.37.0-i686-unknown-netbsd.tar.gz) = 184995958 bytes
 SHA1 (rust-1.37.0-powerpc-unknown-netbsd.tar.gz) = eb243d9fb6827bd908d29a658d469c245bf0199f
 RMD160 (rust-1.37.0-powerpc-unknown-netbsd.tar.gz) = 2b10578cae6523f88d2ce5af8e81dad67e1a5065
 SHA512 (rust-1.37.0-powerpc-unknown-netbsd.tar.gz) = 9d18f57d0d42df6f2f9e3c496a24b97472aca7fc75b7d5747aa57c1c99a923f63c9a22df69891cb2b372fd61242741b27cef2d2bebb95b3fffc4650d99e49259
@@ -48,18 +40,22 @@
 RMD160 (rust-1.37.0-x86_64-unknown-linux-gnu.tar.gz) = 7b623d28eec244521990261bdc7fe04a109943f0
 SHA512 (rust-1.37.0-x86_64-unknown-linux-gnu.tar.gz) = 19685a1a41efb0f0db114c7261dc26a643fd9c74954f56be1b625cbe8552b5f3f925e399f8e8b69debc4bda1b4cf03477069b1d30729141460bd85ffdbc0357f
 Size (rust-1.37.0-x86_64-unknown-linux-gnu.tar.gz) = 269160550 bytes
-SHA1 (rust-1.37.0-x86_64-unknown-netbsd.tar.gz) = 3500508c4e09efd03095f775c752d80244df8291
-RMD160 (rust-1.37.0-x86_64-unknown-netbsd.tar.gz) = 67afdc33f3e9bd5469051e546223c714d3dc8121
-SHA512 (rust-1.37.0-x86_64-unknown-netbsd.tar.gz) = fb6fbe02c2f0f17fd8c656fcc8ad216db9b5a426a94d15e53b304cb7ca6d5225cb0265ab675cb71ef0cd8454b0b2513b75baf2c92a9fc35662d04a873c7be7ca
-Size (rust-1.37.0-x86_64-unknown-netbsd.tar.gz) = 186925930 bytes
+SHA1 (rust-1.38.0-aarch64-unknown-netbsd.tar.gz) = 289771aec3800207bd47065713fa19f9f5a78a92
+RMD160 (rust-1.38.0-aarch64-unknown-netbsd.tar.gz) = 97c89c3ee8ba4c89b999c3af0db2afbc3377ca8a
+SHA512 (rust-1.38.0-aarch64-unknown-netbsd.tar.gz) = f41f2a94913df1afe5edd5d70f8e94241898b29e06f285063cda0271b85a2f612e7e5074e3e9c58af1ce51dca4c76cdc2c765c6bc7355a8280c62c117b1afb49
+Size (rust-1.38.0-aarch64-unknown-netbsd.tar.gz) = 321084212 bytes
+SHA1 (rust-1.38.0-i686-unknown-netbsd.tar.gz) = 4f822144e65dafe45662caae04a89e8d90e7c7e8
+RMD160 (rust-1.38.0-i686-unknown-netbsd.tar.gz) = c2716a3b917a0e291cd25d1c12910f30ee4b9878
+SHA512 (rust-1.38.0-i686-unknown-netbsd.tar.gz) = 8ccf290c34040c058f549fdd953e6e11568ca8e02585934ed896837b8be5ee241d56aa368ab3770cc74ce2e192a81918b478b07420443ed92c422c4327374212
+Size (rust-1.38.0-i686-unknown-netbsd.tar.gz) = 341906414 bytes
+SHA1 (rust-1.38.0-x86_64-unknown-netbsd.tar.gz) = 2907c2601150ffdda2dda5e7dbc98778e1f80045
+RMD160 (rust-1.38.0-x86_64-unknown-netbsd.tar.gz) = b2679e49e7271a5b32e0fc472fee42808fdc6af2
+SHA512 (rust-1.38.0-x86_64-unknown-netbsd.tar.gz) = 24d901cb6094350535dac8f956989e9e80361286cf966a5b4cccc343c069255ecba9bb1bc151e3a7ca80795f056bcfe968604d0e21d6d820bfd085fc1fdf86aa
+Size (rust-1.38.0-x86_64-unknown-netbsd.tar.gz) = 297828691 bytes
 SHA1 (rust-std-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = b8a8913c95d9d7f8894cc5fbae7000d5cd5a8ca9
 RMD160 (rust-std-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 34753f2c4efe6bbec7044a1d417ef9f4586b50a0
 SHA512 (rust-std-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = ea834d454c8d23101d654de3611f07782a676a08f581c501152da13c617be1b08d09a3b1c0b4af34ea79d11b5c15b5a1ece7da8395f4def950b2add245e38f2e
 Size (rust-std-1.35.0-armv7-unknown-netbsd-eabihf.tar.gz) = 86878840 bytes
-SHA1 (rust-std-1.37.0-aarch64-unknown-netbsd.tar.gz) = 25ea467d55d612bdf131ca25c7abbf569fc9fad1
-RMD160 (rust-std-1.37.0-aarch64-unknown-netbsd.tar.gz) = b2b10a406bb260d65a23ac4c0ed25d764eb4a303
-SHA512 (rust-std-1.37.0-aarch64-unknown-netbsd.tar.gz) = 89129a0c9234fe93833b34414d2c382e49bac649d4393fb8ad43e99f28becdd0828bb89158f730ada0d1d1fa7b6210daff1ff2b48d96fa19c0d6bca4bea79d0d
-Size (rust-std-1.37.0-aarch64-unknown-netbsd.tar.gz) = 69207620 bytes
 SHA1 (rust-std-1.37.0-i686-apple-darwin.tar.gz) = 45c230265cfa54e31775b1935bb95bc71c05a12c
 RMD160 (rust-std-1.37.0-i686-apple-darwin.tar.gz) = 66d936969ff034ff4325ce4d00c9e0e5ae43a1ca
 SHA512 (rust-std-1.37.0-i686-apple-darwin.tar.gz) = bc66ad6de904e98bcf770042acfbd2698f3119033dedb6ac64045ec21f7a9cae2bb8894ce3e115383f5d0b78242fb6999f79d33283c9859ad16f5740fe42e030
@@ -72,10 +68,6 @@
 RMD160 (rust-std-1.37.0-i686-unknown-linux-gnu.tar.gz) = ad398f3ab5433dd6f87e57801ff8d85b67321015
 SHA512 (rust-std-1.37.0-i686-unknown-linux-gnu.tar.gz) = 3afc645e348baf93d6238d53b4de293678b6732a8d43ac335bb8dc57f24d3d19b463e6a5385a1582a59b905d499a7ce310aa1d5c12bea23cb33bb8966a170f2f
 Size (rust-std-1.37.0-i686-unknown-linux-gnu.tar.gz) = 81833878 bytes
-SHA1 (rust-std-1.37.0-i686-unknown-netbsd.tar.gz) = 875658fd879e7c69c79abbdeeda50b24dc1eca08
-RMD160 (rust-std-1.37.0-i686-unknown-netbsd.tar.gz) = a072230c173459e7619f6bee93f416b7d047f558
-SHA512 (rust-std-1.37.0-i686-unknown-netbsd.tar.gz) = 67d5f9bee7dad4899be5badfbb4c42d75c3a28f43e50bd3147768afa637bb523570f7d09825766ecfca8bc5056a97d585b3f430f44ecbb1517fa1b1f0e3872db
-Size (rust-std-1.37.0-i686-unknown-netbsd.tar.gz) = 75214423 bytes
 SHA1 (rust-std-1.37.0-powerpc-unknown-netbsd.tar.gz) = 6ec82a8233380da3e31f99c4177fc4f375501514
 RMD160 (rust-std-1.37.0-powerpc-unknown-netbsd.tar.gz) = 9e5413d4f42dd5eb3ba10633cee1ff05fdb5f56e
 SHA512 (rust-std-1.37.0-powerpc-unknown-netbsd.tar.gz) = 4df6de00dda23fb107241d06255b168f4460bd41189cb4340c99f20740416ef66a302b6c2f7149bdef46c4d31700b6f779c7642b70cf0f6f2a1ea511c2d6a774
@@ -96,10 +88,18 @@
 RMD160 (rust-std-1.37.0-x86_64-unknown-linux-gnu.tar.gz) = d4da0a95c640bdb4c2ae9ff97d66246b221c3e39
 SHA512 (rust-std-1.37.0-x86_64-unknown-linux-gnu.tar.gz) = 1b4f4167c99be75510608d9b17bad0f18b156a6c831c037c175f7ea47e040e63219d4fd3305e524d593bde8a3de69321991ede17cace421264cc4eb6574a02ee
 Size (rust-std-1.37.0-x86_64-unknown-linux-gnu.tar.gz) = 83166788 bytes
-SHA1 (rust-std-1.37.0-x86_64-unknown-netbsd.tar.gz) = 1faeee4d815362523e8c76e40d8c2604e59ab0e0
-RMD160 (rust-std-1.37.0-x86_64-unknown-netbsd.tar.gz) = f946a0b49b0fe22472ceadaadc5f8997d8bd268b
-SHA512 (rust-std-1.37.0-x86_64-unknown-netbsd.tar.gz) = fe77bdeb3afcd6b26e796ec03bcf10efcae9e2df833f3264b163bad109ccd1a88f71b298aa028303bc4dd17cf6c79145876a01e97292653c1e1d9eda6842dc01
-Size (rust-std-1.37.0-x86_64-unknown-netbsd.tar.gz) = 87786274 bytes
+SHA1 (rust-std-1.38.0-aarch64-unknown-netbsd.tar.gz) = 85522ed98f791d5a04b10d8ac5fc6021747bf98e
+RMD160 (rust-std-1.38.0-aarch64-unknown-netbsd.tar.gz) = 4ceba04738da65883981f490027719d159d3a89d
+SHA512 (rust-std-1.38.0-aarch64-unknown-netbsd.tar.gz) = 9928a4d3d739f382c876b2b1dc4d3422b620ce0b33b960a94ae9c765bd09de6fe50b3580b8f7ece4d724581288474ed96733440a108c70418c2f3b4ce74eef81
+Size (rust-std-1.38.0-aarch64-unknown-netbsd.tar.gz) = 192002051 bytes
+SHA1 (rust-std-1.38.0-i686-unknown-netbsd.tar.gz) = 18a660129b5dc412f213b7c5d9bf559225943b82
+RMD160 (rust-std-1.38.0-i686-unknown-netbsd.tar.gz) = a43ebc439004d0d8a3e5c149a95025e088427821
+SHA512 (rust-std-1.38.0-i686-unknown-netbsd.tar.gz) = cc0f250c021292405ea1043abbac8fc310c630d2c554fb58b4ebe7ca7b23fcf5c9d6553341282b661b15eb16958a3ccd0d7693707c4acb288cfa8f9fa08f1caa
+Size (rust-std-1.38.0-i686-unknown-netbsd.tar.gz) = 204889878 bytes
+SHA1 (rust-std-1.38.0-x86_64-unknown-netbsd.tar.gz) = e821ae575d1f1e8b6c44af0bd0b59d814797029c
+RMD160 (rust-std-1.38.0-x86_64-unknown-netbsd.tar.gz) = a9877f182d72729891a7ba918ab551ce79d5f9f8
+SHA512 (rust-std-1.38.0-x86_64-unknown-netbsd.tar.gz) = 7e0e031c1e2a5864f8f4185171ae44cba28c1f51a22ed7b9a724bc3478c6bc6defffdacab10fd970947a2899716de86c7dc5b64fa434254ea7e6c4f38e271b12
+Size (rust-std-1.38.0-x86_64-unknown-netbsd.tar.gz) = 217882197 bytes
 SHA1 (rustc-1.38.0-src.tar.gz) = 6ad0f778882c73a689c88e1ecdaab8e7b9ceb27b
 RMD160 (rustc-1.38.0-src.tar.gz) = 95edfbd142e87fd72f4b5b3aacdcfb42df4bca9a
 SHA512 (rustc-1.38.0-src.tar.gz) = eef16fcbd234ffe76158dd971fcc10ca129816c47f84ff2f2fe424c42509c8661ab45458f968cd88bb8eb6bab028d5d86920a4dee1f673f48270e1f446ffa882
@@ -107,7 +107,7 @@
 SHA1 (patch-src_bootstrap_bin_rustc.rs) = 5e6b0cb25401db4fef6e74f73764e69f3c09569c
 SHA1 (patch-src_bootstrap_bootstrap.py) = 5b886b95857bf019c2e37cb380e6905cb444b756
 SHA1 (patch-src_bootstrap_builder.rs) = 7e23348dc5555fdb3833a7f8734cfe687c6e533c
-SHA1 (patch-src_bootstrap_lib.rs) = bc23743f1b9c4ad3d7557b4fdf8a55976ca7f417
+SHA1 (patch-src_bootstrap_lib.rs) = e585b99ea2eb587d5eeb11739b77cde9bf5ad085
 SHA1 (patch-src_build__helper_lib.rs) = ef0b522e303f0490b86e64f40733c2ecb498da5b
 SHA1 (patch-src_librustc__codegen__ssa_back_linker.rs) = e7c592f78b9ee317521cf0258686173a31f1d2e0
 SHA1 (patch-src_librustc__llvm_build.rs) = 7cc2aa0568aa2cbf4eb1fdbb00922b10df0b3ff6
diff -r cad4b82cd818 -r 92cf59951a11 lang/rust/patches/patch-src_bootstrap_lib.rs
--- a/lang/rust/patches/patch-src_bootstrap_lib.rs      Sun Oct 27 18:21:01 2019 +0000
+++ b/lang/rust/patches/patch-src_bootstrap_lib.rs      Sun Oct 27 18:34:27 2019 +0000
@@ -1,11 +1,23 @@
-$NetBSD: patch-src_bootstrap_lib.rs,v 1.4 2019/01/19 12:44:08 ryoon Exp $
+$NetBSD: patch-src_bootstrap_lib.rs,v 1.5 2019/10/27 18:34:27 he Exp $
 
 Don't filter out optimization flags.
 FreeBSD has a particular C++ runtime library name
+Also, don't make warnings fatal -- 1.38.0 warns about a construct
+when building 1.38.0, ref.
+  https://github.com/rust-lang/rust/issues/65722
 
 --- src/bootstrap/lib.rs.orig  2019-01-16 09:30:27.000000000 +0000
 +++ src/bootstrap/lib.rs
-@@ -779,7 +779,6 @@ impl Build {
+@@ -104,7 +104,7 @@
+ //! also check out the `src/bootstrap/README.md` file for more information.
+ 
+ // NO-RUSTC-WRAPPER
+-#![deny(warnings, rust_2018_idioms, unused_lifetimes)]
++#![deny(rust_2018_idioms, unused_lifetimes)]
+ 
+ #![feature(core_intrinsics)]
+ #![feature(drain_filter)]
+@@ -768,7 +768,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())
@@ -13,7 +25,7 @@
                             .collect::<Vec<String>>();
  
          // If we're compiling on macOS then we add a few unconditional flags
-@@ -790,6 +789,11 @@ impl Build {
+@@ -779,6 +778,11 @@ impl Build {
              base.push("-stdlib=libc++".into());
          }
Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/libgphoto2 libgphoto2: fix build on sunos by for...
Next by Date: [pkgsrc/trunk]: pkgsrc/doc doc: Updated pkgtools/url2pkg to 19.3.4
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/libgphoto2 libgphoto2: fix build on sunos by for...
Next by Thread: [pkgsrc/trunk]: pkgsrc/doc doc: Updated pkgtools/url2pkg to 19.3.4
Indexes:
Home | Main Index | Thread Index | Old Index