Build on NetBSD/i386 using the 1.51.0 i586 bootstrap instead of i686.

[Havard Eidnes <he%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Wed Apr 14 15:44:19 2021 +0200
Changeset:	ee897ca834c5d37cf26c73aeaf9c57bd8e9d9257

Modified Files:
	rust/Makefile
	rust/distinfo
	rust/patches/patch-src_bootstrap_builder.rs

Log Message:
Build on NetBSD/i386 using the 1.51.0 i586 bootstrap instead of i686.

Add a patch so that 1.51.0 can build 1.51.0 without warnings turned
into errors.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ee897ca834c5d37cf26c73aeaf9c57bd8e9d9257

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 rust/Makefile                               |  4 ++--
 rust/distinfo                               | 18 +++++++++---------
 rust/patches/patch-src_bootstrap_builder.rs | 19 +++++++++++++++----
 3 files changed, 26 insertions(+), 15 deletions(-)

diffs:
diff --git a/rust/Makefile b/rust/Makefile
index 738f3da45c..f27e0c1c60 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -211,8 +211,8 @@ 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.50.0
-RUST_ARCH=		i686-unknown-netbsd
+RUST_STAGE0_VER=	1.51.0
+RUST_ARCH=		i586-unknown-netbsd
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 RUST_STD_STAGE0:=	rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 SITES.${RUST_STAGE0}=	${MASTER_SITE_LOCAL:=rust/}
diff --git a/rust/distinfo b/rust/distinfo
index 73c4a86aa4..1c6161dd0e 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -12,10 +12,6 @@ SHA1 (rust-1.50.0-i686-unknown-linux-gnu.tar.gz) = f946618c821caab5c58dd3eb2a3af
 RMD160 (rust-1.50.0-i686-unknown-linux-gnu.tar.gz) = a299095db6fc1a2160415087638a35b0bc02cd95
 SHA512 (rust-1.50.0-i686-unknown-linux-gnu.tar.gz) = 13d3e71bf88fc92ffd7f2c5a59e151dcd0e25e1b9256a107d96ab3110bab698b1294fe7dcbc4f3a847c37666e54a6183c41a8320ddbbcd5ebe907e13e7f5c1bc
 Size (rust-1.50.0-i686-unknown-linux-gnu.tar.gz) = 360543712 bytes
-SHA1 (rust-1.50.0-i686-unknown-netbsd.tar.gz) = 51e95c867b817ce0b9aaaf17f86436cc1d0fffe4
-RMD160 (rust-1.50.0-i686-unknown-netbsd.tar.gz) = 0bf57346ef61847857362723f26da85ff01821a9
-SHA512 (rust-1.50.0-i686-unknown-netbsd.tar.gz) = da101add32f2827b57c23360d2a48f30a0f9b4da7394d9efaef44d146a7e8ef71f0e1c87ee850679b1de07e5d977deec2f4b0a26f7d8b41a39040afa34414168
-Size (rust-1.50.0-i686-unknown-netbsd.tar.gz) = 302885299 bytes
 SHA1 (rust-1.50.0-powerpc-unknown-netbsd.tar.gz) = 6f58b67c3487186e47e6cf12b9ab13562a0724b3
 RMD160 (rust-1.50.0-powerpc-unknown-netbsd.tar.gz) = 60f565681f2cbed690c1551c7648609cfcb5148d
 SHA512 (rust-1.50.0-powerpc-unknown-netbsd.tar.gz) = 4e5db0d3a5aff3b67c5ec988e6d632fd81dc5cc305aa14bba595de28f3154d13fdcfea6fc69f4a5264220bf471fab1add8ae089a87a05427d7a3a936749941bb
@@ -48,6 +44,10 @@ SHA1 (rust-1.50.0-x86_64-unknown-netbsd.tar.gz) = 3a3aa685e7b999b0ec13447c6343dd
 RMD160 (rust-1.50.0-x86_64-unknown-netbsd.tar.gz) = 0e47efe8b6de2cf929739ee73134372def159882
 SHA512 (rust-1.50.0-x86_64-unknown-netbsd.tar.gz) = b603ebf2475963fdf65eeea9d8db8b9c9e68638ba492a0ed1131259c46f10bfca8868ba1c78a4ce5bde0094d0f3b0e4414dc5b80b087faf129b5aba3e0ad14c5
 Size (rust-1.50.0-x86_64-unknown-netbsd.tar.gz) = 256369818 bytes
+SHA1 (rust-1.51.0-i586-unknown-netbsd.tar.gz) = e549fb7465f954027ef20d8314d4b0af3e42af28
+RMD160 (rust-1.51.0-i586-unknown-netbsd.tar.gz) = 81c1f80a64babbc34b728c4c605d06d47b0b7d58
+SHA512 (rust-1.51.0-i586-unknown-netbsd.tar.gz) = 91903a1c852f71033130b90f196a584878270d367969aaa7350a205b1f1dbc4f6b943f853905fd5c7887d1191c3689d823ee6e143c5d6775e2e00db4a93e82ca
+Size (rust-1.51.0-i586-unknown-netbsd.tar.gz) = 321348313 bytes
 SHA1 (rust-std-1.50.0-aarch64-unknown-netbsd.tar.gz) = 3a0706658c2967b82117e417a00fabb49e4e5616
 RMD160 (rust-std-1.50.0-aarch64-unknown-netbsd.tar.gz) = 0ce19d5de264b5f6c2c125ca03576934379e2af6
 SHA512 (rust-std-1.50.0-aarch64-unknown-netbsd.tar.gz) = faaec54fbda06c89088ec54a282f1c9d98dadc3ec8de277bd189efa99fffee5c6f8886f1a39b1d6f0ba6f84af79f563b8d56eab290dd765d40cd81177955ccaf
@@ -60,10 +60,6 @@ SHA1 (rust-std-1.50.0-i686-unknown-linux-gnu.tar.gz) = 1126f9909bc8bbe447f08b5ad
 RMD160 (rust-std-1.50.0-i686-unknown-linux-gnu.tar.gz) = aaa623f1b26e6bd4cfab6d36cf12f448e9f647f5
 SHA512 (rust-std-1.50.0-i686-unknown-linux-gnu.tar.gz) = 550439fe6402c8114f70803749f6514b8da02bfc85777c73079c5667a1df5d31f1c38086f9043bd4fe947367ec583f30f1aa88df293b493b84d699cd946888e7
 Size (rust-std-1.50.0-i686-unknown-linux-gnu.tar.gz) = 40402401 bytes
-SHA1 (rust-std-1.50.0-i686-unknown-netbsd.tar.gz) = 9708581f20991ba47c307456e6ade0f9dc05563a
-RMD160 (rust-std-1.50.0-i686-unknown-netbsd.tar.gz) = d6450f09a3474d6fdd529e2a51ebd5aabfe3b1f1
-SHA512 (rust-std-1.50.0-i686-unknown-netbsd.tar.gz) = 44af495554c3521c78a46f69053800aab1e6ff99a8f403a65c4c9202fee9fba450e9e5729fff1e0a6d10fb59742969317d33fb3ca50e9dec13f37971a6f9c3d3
-Size (rust-std-1.50.0-i686-unknown-netbsd.tar.gz) = 36171071 bytes
 SHA1 (rust-std-1.50.0-powerpc-unknown-netbsd.tar.gz) = 1ed81ee8b56dccd64adc243a520434d74edefe01
 RMD160 (rust-std-1.50.0-powerpc-unknown-netbsd.tar.gz) = cbf13169b632686db1dd6f17432a8e313bfd6ec5
 SHA512 (rust-std-1.50.0-powerpc-unknown-netbsd.tar.gz) = 2dc92e7a4f0e27a170208ee48e5985aad1ff3dbd8a48ecc24187f46efcdd9817c0e0260fdc605985c1d4cbc7a8612ae64d1e117a5c68ca86fd1b742955181720
@@ -92,6 +88,10 @@ SHA1 (rust-std-1.50.0-x86_64-unknown-netbsd.tar.gz) = f2eb537fe359fca0533a1b90ea
 RMD160 (rust-std-1.50.0-x86_64-unknown-netbsd.tar.gz) = bbb1ea37aa484119b07f4a53d69a993c498b1eea
 SHA512 (rust-std-1.50.0-x86_64-unknown-netbsd.tar.gz) = 19af8459daa06434a9cb71f379cb43d5e2c3805c040f0afef804327f920fa55c6dc5dcce634f12c7e9e334d491df679e98ddec4f7ded5167b0ba5959eefdc6be
 Size (rust-std-1.50.0-x86_64-unknown-netbsd.tar.gz) = 39808048 bytes
+SHA1 (rust-std-1.51.0-i586-unknown-netbsd.tar.gz) = 2369f4c131a31f4e4a85a4ea194f74ff99966211
+RMD160 (rust-std-1.51.0-i586-unknown-netbsd.tar.gz) = 52ff1a6a489e5f48791c2838a2736d31876203ca
+SHA512 (rust-std-1.51.0-i586-unknown-netbsd.tar.gz) = 3d4f03f9cc8be0e739bde279006e5fc4b2b67e7bff97ed496c12d54acd0d327d22ca7df7bc91e13d545d0b73f2b70ea5f2374f4953ace9956061015b9156c732
+Size (rust-std-1.51.0-i586-unknown-netbsd.tar.gz) = 36379315 bytes
 SHA1 (rustc-1.51.0-src.tar.gz) = 7a54c0a17efed9b41e6f211727edc5e00620b871
 RMD160 (rustc-1.51.0-src.tar.gz) = 86012fa02e52e4a06e5c76aaa482face78b38ef5
 SHA512 (rustc-1.51.0-src.tar.gz) = 694189c7d48537b29fdf39e1b4cac58166c72d8e5adef59da788a5a49ac803ef4c1648b3e36bc9834305240a3a394bef052fc3388ea9b7de46d3e5c7342aefe7
@@ -107,7 +107,7 @@ SHA1 (patch-library_std_src_sys_unix_mod.rs) = 927b03f3f34bd21a81bd2a8b6bcf30fe2
 SHA1 (patch-library_std_src_sys_unix_thread.rs) = f3af869fba5bc0ab8d28042f55fe830f93b8ef54
 SHA1 (patch-library_unwind_build.rs) = ae096a20aed95304eb3806be4cd237fe4ffd9afb
 SHA1 (patch-src_bootstrap_bootstrap.py) = a8c094a781339a613221259d8ce7d00f6e0aa3e6
-SHA1 (patch-src_bootstrap_builder.rs) = d6ea923f5c67a1b1e98350d6269b4d78817a5934
+SHA1 (patch-src_bootstrap_builder.rs) = 8427f3f9320a168581d0dd0142dc3952b7953183
 SHA1 (patch-src_bootstrap_compile.rs) = 86fe55d04f7a8c5ec05dbdcb0fe5a0d6c07584d5
 SHA1 (patch-src_bootstrap_lib.rs) = 3277f2be69a269ac761a2a6ab4d5389d121e6ca6
 SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = d49503d19c30a64d571eb7fa79e7aad7038cd427
diff --git a/rust/patches/patch-src_bootstrap_builder.rs b/rust/patches/patch-src_bootstrap_builder.rs
index b5e0b3b80d..c5b0e06a1b 100644
--- a/rust/patches/patch-src_bootstrap_builder.rs
+++ b/rust/patches/patch-src_bootstrap_builder.rs
@@ -5,9 +5,11 @@ Use @PREFIX@, not $ORIGIN in rpath.
 
 Fix RPATH for pkgsrc.
 
---- src/bootstrap/builder.rs.orig	2021-02-10 17:36:44.000000000 +0000
+Workaround for building 1.51 with 1.51 bootstrap.
+
+--- src/bootstrap/builder.rs.orig	2021-03-23 16:15:10.000000000 +0000
 +++ src/bootstrap/builder.rs
-@@ -483,7 +483,6 @@ impl<'a> Builder<'a> {
+@@ -482,7 +482,6 @@ impl<'a> Builder<'a> {
                  install::Clippy,
                  install::Miri,
                  install::Analysis,
@@ -15,12 +17,21 @@ Fix RPATH for pkgsrc.
                  install::Rustc
              ),
              Kind::Run => describe!(run::ExpandYamlAnchors, run::BuildManifest),
-@@ -1082,7 +1081,7 @@ impl<'a> Builder<'a> {
+@@ -1088,7 +1087,7 @@ impl<'a> Builder<'a> {
                  rustflags.arg("-Zosx-rpath-install-name");
                  Some("-Wl,-rpath,@loader_path/../lib")
              } else if !target.contains("windows") {
 -                Some("-Wl,-rpath,$ORIGIN/../lib")
-+                Some("-Wl,-rpath,@PREFIX@/lib")
++                Some("-Wl,-rpath,/usr/pkg/lib")
              } else {
                  None
              };
+@@ -1490,7 +1489,7 @@ impl<'a> Builder<'a> {
+                 for el in stack.iter().rev() {
+                     out += &format!("\t{:?}\n", el);
+                 }
+-                panic!(out);
++                std::panic::panic_any(out);
+             }
+             if let Some(out) = self.cache.get(&step) {
+                 self.verbose(&format!("{}c {:?}", "  ".repeat(stack.len()), step));