 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.215 2021/01/03 21:23:43 he Exp $
+# $NetBSD: Makefile,v 1.216 2021/01/03 21:54:09 he Exp $
 DISTNAME=	rustc-1.48.0-src
 PKGNAME=	${DISTNAME:S/rustc/rust/:S/-src//}
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.rust-lang.org/
 COMMENT=	Safe, concurrent, practical language
 LICENSE=	mit OR apache-2.0
 CONFLICTS+=	rust-bin-[0-9]*
 @@ -334,27 +334,26 @@ CKSUMS+=	5e252578b5d266f6a4c8dc9f71ca7a9
 CKSUM_CRATES+=	vendor/stacker
 CKSUMS+=	cee329550bad2ed1182abb71db9c24558a91b12e1eab8d9a48e23b997bb8f04e
 CKSUMS+=	79915b243d02df1dc698f5c2de3a9356c6c296d2dedb06d9035dbcc2f8972cf4
 CKSUM_CRATES+=	vendor/net2
 CKSUMS+=	fd072307ebbaa01cfe1fd7553d7f42d27093b2bd32dd81d419d2e1c9423495a0
 CKSUMS+=	9e146a847e1f726fa7d7eae224aaa925030287f99770f950a012cb398e088d12
 CKSUM_CRATES+=	vendor/openssl-src
 CKSUMS+=	29499e62a2cde2fda48d21df58812ee5c198ef744522992bde8faae76747ac08
 CKSUMS+=	e34f9921c6531d043f3516821442aaeda86c7912d40cbddaf79bba6b08c37952
 SUBST_CLASSES+=		cksum
 SUBST_STAGE.cksum=	pre-configure
 .for crate in ${CKSUM_CRATES}
 SUBST_FILES.cksum+=	${crate}/.cargo-checksum.json
 .endfor
 .for from to in ${CKSUMS}
 SUBST_SED.cksum+=	-e 's,${from},${to},g'
 .endfor
 # Patchelf appears to create unrecognized binaries...
 #.if ${OPSYS} == "NetBSD"
 #TOOL_DEPENDS+=	patchelf-[0-9]*:../../devel/patchelf
 #PATCHELF=	${PREFIX}/bin/patchelf
 @@ -398,57 +397,79 @@ post-extract:
 MAKE_ENV+=		OPENSSL_DIR=${SSLBASE}
 .endif
 .if ${OPSYS} == "NetBSD" && !empty(PKGSRC_COMPILER:Mclang) && !exists(/lib/libgcc_s.so)
 BUILDLINK_TRANSFORM+=	rm:-lgcc_s
 MAKE_ENV+=		PKGSRC_HAVE_LIBCPP=yes
 .endif
 pre-build: pre-build-fix
 .if ${OPSYS} == "NetBSD" && !empty(PKGSRC_COMPILER:Mclang) && !exists(/lib/libgcc_s.so)
 	cp ${FILESDIR}/libgcc_s.so.1 ${RUST_BOOTSTRAP_PATH}/lib/.
 .endif
+#
 # These are essentially copies of the "all", "test", and "install" Makefile
 # targets, but are duplicated here so that we can specify -j.
+#
 do-build:
-	cd ${WRKSRC} \
+	${RUN}${_ULIMIT_CMD}						\
-	&& ${_ULIMIT_CMD} ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} \
+	cd ${WRKSRC} &&							\
-	sh -c "if [ \"${BUILD_TARGET}\" = \"dist\" ]; then \
+	${SETENV} ${MAKE_ENV}						\
-			unset DESTDIR; \
+	sh -c "if [ \"${BUILD_TARGET}\" = \"dist\" ]; then		\
-		fi; \
+		unset DESTDIR;						\
-		${PYTHONBIN} ./x.py -v ${BUILD_TARGET} -j ${_MAKE_JOBS_N}"
+		${PYTHONBIN} ./x.py -v					\
 		    ${BUILD_TARGET} -j ${_MAKE_JOBS_N};			\
 	else								\
 		${PYTHONBIN} ./x.py -v					\
 		    ${BUILD_TARGET} --stage 2 -j ${_MAKE_JOBS_N} &&	\
 		${PYTHONBIN} ./x.py -v					\
 		    doc --stage 2 -j ${_MAKE_JOBS_N};			\
 	fi"
 do-test:
 	${RUN}${_ULIMIT_CMD}						\
 	cd ${WRKSRC} &&							\
 	${SETENV} ${MAKE_ENV}						\
 		${PYTHONBIN} ./x.py -v test -j ${_MAKE_JOBS_N}
 do-install:
-	cd ${WRKSRC} \
+	${RUN}${_ULIMIT_CMD}						\
-	&& ${_ULIMIT_CMD} ${SETENV} ${INSTALL_ENV} ${MAKE_ENV} \
+	cd ${WRKSRC} &&							\
 	${SETENV} ${MAKE_ENV} ${INSTALL_ENV} 				\
 		${PYTHONBIN} ./x.py -v install -j ${_MAKE_JOBS_N}
 .if ${OPSYS} == "Darwin"
 .PHONY: fix-darwin-install-name
 post-install: fix-darwin-install-name
 fix-darwin-install-name:
 	for f in ${DESTDIR}${PREFIX}/lib/librustc_macros-*.dylib \
 	    ${DESTDIR}${PREFIX}/lib/libtracing_attributes-*.dylib \
 	    ${DESTDIR}${PREFIX}/lib/libchalk_derive-*.dylib; do \
 		install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \
 	done
 .endif
 GENERATE_PLIST+=	${FIND} ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
 			${SED} -e 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
 # Create a relocatable stage2 bootstrap from the bits we just built that can be
 # used to build the next version of rust.  Currently only tested on SmartOS.
+#
-BOOTSTRAP_TMPDIR=	${WRKDIR}/${PKGNAME_NOREV}-${RUST_ARCH}
+# Use the alternate BOOTSTRAP_NAME when creating a nightly release.
+#
 #BOOTSTRAP_NAME=	${PKGNAME_NOREV:C/rust/rust-nightly/}-${RUST_ARCH}
 BOOTSTRAP_NAME=		${PKGNAME_NOREV}-${RUST_ARCH}
 BOOTSTRAP_TMPDIR=	${WRKDIR}/${BOOTSTRAP_NAME}
 USE_TOOLS+=		gtar
 # The NetBSD part is so far untested, because I could not convince
 # the rust build to use the gcc wrapper when building natively,
 # so that I could get a placeholder in the RPATH, because chrpath
 # cannot extend the length of the RPATH...
 ELFEDIT?=	/usr/bin/elfedit
 .PHONY: stage0-bootstrap
 stage0-bootstrap: install
 	${RM} -rf ${BOOTSTRAP_TMPDIR}
 	${MKDIR} ${BOOTSTRAP_TMPDIR}
 .if ${OPSYS} == "NetBSD"
 @@ -478,52 +499,52 @@ stage0-bootstrap: install
 	${ECHO} "Fixed stage0 bootstrap in ${BOOTSTRAP_TMPDIR}:"; \
 	${ECHO} "$${RUSTC_FILE}"; \
 	${ECHO} "$${RUST_STD_FILE}"; \
+	)
 .endif
 .if ${OS_VARIANT} == "SmartOS"
 	${CP} -R ${DESTDIR}/${PREFIX}/bin ${BOOTSTRAP_TMPDIR}/
 	${CP} -R ${DESTDIR}/${PREFIX}/lib ${BOOTSTRAP_TMPDIR}/
 	${MKDIR} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc
 	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
+	# direct dependencies
 	for lib in libLLVM-10.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
+	# 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 \
 		   libssh2.so.1 libunistring.so.2; do \
 		${CP} ${PREFIX}/lib/$${lib} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
 	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
 	for f in ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/*.so*; do \
 		${ELFEDIT} -e 'dyn:runpath $$ORIGIN' $$f; \
 	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 \
 		${ELFEDIT} -e 'dyn:runpath $$ORIGIN:$$ORIGIN/../../..:$$ORIGIN/../../../pkgsrc' $$f; \
 	done
 	(cd ${WRKDIR}; \
-	 ${GTAR} -zcf ${PKGNAME_NOREV}-${RUST_ARCH}.tar.gz ${PKGNAME_NOREV}-${RUST_ARCH})
+	 ${GTAR} -zcf ${BOOTSTRAP_NAME}.tar.gz ${BOOTSTRAP_NAME})
 .endif
 .include "options.mk"
 # These dependencies currently use the bundled sources as they require
 # development features not yet available in released versions.
+#
 #.include "../../devel/libgit2/buildlink3.mk"
 #.include "../../security/libssh2/buildlink3.mk"
 #.include "../../www/http-parser/buildlink3.mk"
 #.include "../../devel/jemalloc/buildlink3.mk"
 ## Issues specific to: bootstrap AND NetBSD follow
 @@ -535,46 +556,41 @@ stage0-bootstrap: install
 .if (${OPSYS} == "NetBSD") && \
 		((${MACHINE_ARCH} == "i386") || \
 		 (${MACHINE_ARCH} == "sparc64") || \
 		 (${MACHINE_ARCH} == "powerpc")) \
 	&& (empty(OS_VERSION:M[012345678].*) || \
 	    !empty(OS_VERSION:M8.99.*))
 # Bootstrap kits are built on 8.0, so that a single bootstrap can run
 # on multiple systems.  Thus later versions need the compat80 package.
 # \todo Explain why this is limited to a small list of architectures,
 # and in particular why not x86_64.
 DEPENDS+=	compat80>=0:../../emulators/compat80
 .endif
 .if (${MACHINE_ARCH} == "powerpc")
 # LLVM needs libatomic for 64-bit atomics on powerpc
 .include "../../devel/libatomic/buildlink3.mk"
 # Make those libraries available via a unique directory:
 DEPENDS+=	libatomic-links>=0:../../devel/libatomic-links
 .endif
 .if (${OPSYS} == "NetBSD") && \
 		((${MACHINE_ARCH} == "i386")) \
 	&& (empty(OS_VERSION:M[012345678].*) || \
 	    !empty(OS_VERSION:M8.99.*))
 # Bootstrap kits use openssl, which on NetBSD 8 comes from pkgsrc.
 # Therefore the pkgsrc openssl libs need to be present as well.
 # The 1.44.1 i686 bootstrap links with pkgsrc openssl.  The others do
 # not.  When the package is built,
 # cargo links against pkgsrc openssl, so it must be a run-time
 # dependency as well.  Forcing USE_BUILTIN.openssl=no results in a
 # mysterious heimdal error, but straight DEPENDS seems to result in a
 # satisfactory package build.
 # While this is icky, it is for the time being better than no rust package.
 DEPENDS+=	openssl>=1.1:../../security/openssl
 .endif
 # This is for when we build natively:
 .if ((${OPSYS} == "NetBSD") && \
-	((${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "i386")))
+    ((${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "i386")))
-# For 8-byte atomics, required by LLVM
+# LLVM needs libatomic for 64-bit atomics on powerpc and i386
 .include "../../devel/libatomic/buildlink3.mk"
 # Make those libraries available via a unique directory:
 DEPENDS+=	libatomic-links>=0:../../devel/libatomic-links
 .endif
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/tool.mk"
 .include "../../mk/bsd.pkg.mk"