rust: Bump illumos bootstrap and fix stage0 script.

[Jonathan Perkin <jperkin%joyent.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jonathan Perkin <jperkin%joyent.com@localhost>
Pushed By:	jperkin
Date:		Fri Sep 3 10:14:23 2021 +0100
Changeset:	5c42f4c435deaead1c7755b03b69764c988e6095

Modified Files:
	rust/Makefile
	rust/distinfo

Log Message:
rust: Bump illumos bootstrap and fix stage0 script.

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

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

diffstat:
 rust/Makefile | 41 +++++++++++++++++++++++++----------------
 rust/distinfo |  8 ++++----
 2 files changed, 29 insertions(+), 20 deletions(-)

diffs:
diff --git a/rust/Makefile b/rust/Makefile
index 1879415d11..3c1ce14414 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -204,7 +204,7 @@ pre-build-fix:
 # x86_64-sun-solaris bootstrap and comment out the overrides.
 #
 .if !empty(MACHINE_PLATFORM:MSunOS-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
-RUST_STAGE0_VER=	1.52.1
+RUST_STAGE0_VER=	1.53.0
 RUST_ARCH:=		x86_64-unknown-illumos
 RUST_STAGE0:=		rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
 SITES.${RUST_STAGE0}=	https://us-east.manta.joyent.com/pkgsrc/public/pkg-bootstraps/
@@ -509,36 +509,45 @@ stage0-bootstrap: install
 	${CP} -R ${DESTDIR}/${PREFIX}/bin ${BOOTSTRAP_TMPDIR}/
 	${CP} -R ${DESTDIR}/${PREFIX}/lib ${BOOTSTRAP_TMPDIR}/
 	${MKDIR} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc
+	set -e; \
 	for lib in libgcc_s.so.1 libssp.so.0 libstdc++.so.6; do \
 		${CP} `${PKG_CC} -print-file-name=$${lib}` \
 		    ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
-	done
-	# direct dependencies
-	for lib in libLLVM-10.so libcrypto.so.1.1 libcurl.so.4 \
+	done; \
+	for lib in libLLVM-12.so libcrypto.so.1.1 libcurl.so.4 \
 		   libssl.so.1.1 libz.so.1; do \
 		${CP} ${PREFIX}/lib/$${lib} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
-	done
-	# libcurl dependencies
-	for lib in libiconv.so.2 libidn2.so.0 libintl.so.8 liblber-2.4.so.2 \
-		   libldap-2.4.so.2 libnghttp2.so.14 libsasl2.so.3 \
+	done; \
+	for lib in libiconv.so.2 libidn2.so.0 libintl.so.8 liblber-2.5.so.0 \
+		   libldap-2.5.so.0 libnghttp2.so.14 libsasl2.so.3 \
 		   libssh2.so.1 libunistring.so.2; do \
 		${CP} ${PREFIX}/lib/$${lib} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
-	done
+	done; \
 	for f in ${BOOTSTRAP_TMPDIR}/bin/*; do \
 		/bin/file -b "$$f" | grep ^ELF >/dev/null || continue; \
 		${ELFEDIT} -e 'dyn:runpath $$ORIGIN/../lib:$$ORIGIN/../lib/pkgsrc' $$f; \
-	done
+	done; \
 	for f in ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/*.so*; do \
 		${ELFEDIT} -e 'dyn:runpath $$ORIGIN' $$f; \
-	done
+	done; \
 	for f in ${BOOTSTRAP_TMPDIR}/lib/*.so*; do \
 		${ELFEDIT} -e 'dyn:runpath $$ORIGIN:$$ORIGIN/pkgsrc' $$f; \
-	done
-	for f in ${BOOTSTRAP_TMPDIR}/lib/rustlib/*/*/*.so*; do \
+	done; \
+	for f in ${BOOTSTRAP_TMPDIR}/lib/rustlib/*/*/*.so* \
+		 ${BOOTSTRAP_TMPDIR}/lib/rustlib/*/bin/*; do \
 		${ELFEDIT} -e 'dyn:runpath $$ORIGIN:$$ORIGIN/../../..:$$ORIGIN/../../../pkgsrc' $$f; \
-	done
-	(cd ${WRKDIR}; \
-	 ${GTAR} -zcf ${BOOTSTRAP_NAME}.tar.gz ${BOOTSTRAP_NAME})
+	done; \
+	cd ${WRKDIR}; ${GTAR} -zcf ${BOOTSTRAP_NAME}.tar.gz ${BOOTSTRAP_NAME}
+	@${ECHO} ""
+	@${ECHO} "Verify correct library paths using the following:"
+	@${ECHO} ""
+	@${ECHO} "	cd ${BOOTSTRAP_TMPDIR}"
+	@${ECHO} "	find . -type f | xargs ldd 2>/dev/null | egrep 'not.found|${PREFIX}'"
+	@${ECHO} ""
+	@${ECHO} "If there is no output then this bootstrap kit is ready to go:"
+	@${ECHO} ""
+	@${ECHO} "	${WRKDIR}/${BOOTSTRAP_NAME}.tar.gz"
+	@${ECHO} ""
 .endif
 
 .include "options.mk"
diff --git a/rust/distinfo b/rust/distinfo
index 705fb17cfb..e1e8e4ab27 100644
--- a/rust/distinfo
+++ b/rust/distinfo
@@ -1,9 +1,5 @@
 $NetBSD: distinfo,v 1.118 2020/08/06 11:42:56 jperkin Exp $
 
-SHA1 (rust-1.52.1-x86_64-unknown-illumos.tar.gz) = c1de846c91a6b826c8304e1038f909c8bd6490b6
-RMD160 (rust-1.52.1-x86_64-unknown-illumos.tar.gz) = 86f743be2fb4993ee9a6f0b5a78b0173d2bbd117
-SHA512 (rust-1.52.1-x86_64-unknown-illumos.tar.gz) = 1128518c2b9a15eefec0dd040a9607679398f88f7c1c34c7b8b91f28f343236bc2616df1bbe0fcb91d75ddf8c47a83598755b0a153648f0e7d1e48bb2b68e462
-Size (rust-1.52.1-x86_64-unknown-illumos.tar.gz) = 190549996 bytes
 SHA1 (rust-1.53.0-aarch64-unknown-netbsd.tar.gz) = 805ceb6105c444f6c9fba0402ddaf4fbc6a96da3
 RMD160 (rust-1.53.0-aarch64-unknown-netbsd.tar.gz) = bb292d9dd7800bbdeb8d1df868f1f901082444eb
 SHA512 (rust-1.53.0-aarch64-unknown-netbsd.tar.gz) = db8c6865749c5536d3c5524e8d314d353b4857bd6845f9e5f9d467a39faa9c41afe02aca2c1a6dd0414ea878c0eaf3b87ba9d8c660b9c29fee0231fc69e81e51
@@ -44,6 +40,10 @@ SHA1 (rust-1.53.0-x86_64-unknown-freebsd.tar.gz) = f2058fec9907cc57d1871798d7401
 RMD160 (rust-1.53.0-x86_64-unknown-freebsd.tar.gz) = e5d2678cdbbd8a400c5d33d41286133098ac59ec
 SHA512 (rust-1.53.0-x86_64-unknown-freebsd.tar.gz) = e9eb71412defd6bcc61fe07b0c7103ab0f9582dd9d169d8c30158919c3f28327852ee6caa6dd938b2f7b9aad8f054558e42bba99eb557ad024df1c68da456ff4
 Size (rust-1.53.0-x86_64-unknown-freebsd.tar.gz) = 287871664 bytes
+SHA1 (rust-1.53.0-x86_64-unknown-illumos.tar.gz) = 4608af3c88d50dd43f8a95e117fb5818ba09326e
+RMD160 (rust-1.53.0-x86_64-unknown-illumos.tar.gz) = 0f126319ee1ceb3394cc48d96f245c2ae2b0978f
+SHA512 (rust-1.53.0-x86_64-unknown-illumos.tar.gz) = 2f1373b61f796c84bc0257c9f83fcc787cafd8d408bdc73a8069287774b06ecf025d222655a2bcbb74bfdbdbe826d6eb3c36454f10370d59e21f39a650fa5bc3
+Size (rust-1.53.0-x86_64-unknown-illumos.tar.gz) = 208714201 bytes
 SHA1 (rust-1.53.0-x86_64-unknown-linux-gnu.tar.gz) = 2042ff56acca0fa8d39c819cba6ff80eba17e19d
 RMD160 (rust-1.53.0-x86_64-unknown-linux-gnu.tar.gz) = 4cd0b7dfd4599f2376097ec05bd9e6f2c7a14e74
 SHA512 (rust-1.53.0-x86_64-unknown-linux-gnu.tar.gz) = 0df9a5116ab7973f229e6a26ec623798c5b68e935e2e8bca9603ffc5f97be669f401473a306d731d46e76b461d60c96dac6926e59d8bd2e0fe779a1319624317