Thu Apr 18 12:00:45 2024 UTC (35d)
rust: Revert part of last update to fix lib names.


(jperkin)
diff -r1.305 -r1.306 pkgsrc/lang/rust/Makefile
cvs diff -r1.305 -r1.306 pkgsrc/lang/rust/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust/Makefile 2024/04/18 09:29:41 1.305
+++ pkgsrc/lang/rust/Makefile 2024/04/18 12:00:45 1.306
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.305 2024/04/18 09:29:41 pin Exp $ 1# $NetBSD: Makefile,v 1.306 2024/04/18 12:00:45 jperkin Exp $
2 2
3DISTNAME= rustc-1.76.0-src 3DISTNAME= rustc-1.76.0-src
4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} 4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= https://static.rust-lang.org/dist/ 6MASTER_SITES= https://static.rust-lang.org/dist/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.rust-lang.org/ 9HOMEPAGE= https://www.rust-lang.org/
10COMMENT= Safe, concurrent, practical language 10COMMENT= Safe, concurrent, practical language
11LICENSE= mit OR apache-2.0 11LICENSE= mit OR apache-2.0
12 12
13CONFLICTS+= rust-bin-[0-9]* 13CONFLICTS+= rust-bin-[0-9]*
14 14
@@ -620,28 +620,28 @@ stage0-bootstrap: install @@ -620,28 +620,28 @@ stage0-bootstrap: install
620 ${ECHO} "$${RUSTC_FILE}"; \ 620 ${ECHO} "$${RUSTC_FILE}"; \
621 ${ECHO} "$${RUST_STD_FILE}"; \ 621 ${ECHO} "$${RUST_STD_FILE}"; \
622 ) 622 )
623.endif 623.endif
624.if ${OS_VARIANT} == "SmartOS" 624.if ${OS_VARIANT} == "SmartOS"
625 ${CP} -R ${DESTDIR}/${PREFIX}/bin ${BOOTSTRAP_TMPDIR}/ 625 ${CP} -R ${DESTDIR}/${PREFIX}/bin ${BOOTSTRAP_TMPDIR}/
626 ${CP} -R ${DESTDIR}/${PREFIX}/lib ${BOOTSTRAP_TMPDIR}/ 626 ${CP} -R ${DESTDIR}/${PREFIX}/lib ${BOOTSTRAP_TMPDIR}/
627 ${MKDIR} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc 627 ${MKDIR} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc
628 set -e; \ 628 set -e; \
629 for lib in libgcc_s.so.1 libstdc++.so.6; do \ 629 for lib in libgcc_s.so.1 libstdc++.so.6; do \
630 ${CP} `${PKG_CC} -print-file-name=$${lib}` \ 630 ${CP} `${PKG_CC} -print-file-name=$${lib}` \
631 ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \ 631 ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
632 done; \ 632 done; \
633 for lib in libLLVM-15.so libcrypto.so.1.1 libcurl.so.4 \ 633 for lib in libLLVM-16.so libcrypto.so.3 libcurl.so.4 \
634 libssl.so.1.1 libz.so.1 libzstd.so.1; do \ 634 libssl.so.3 libz.so.1 libzstd.so.1; do \
635 ${CP} ${PREFIX}/lib/$${lib} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \ 635 ${CP} ${PREFIX}/lib/$${lib} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
636 done; \ 636 done; \
637 for lib in libiconv.so.2 libidn2.so.0 libintl.so.8 liblber.so.2 \ 637 for lib in libiconv.so.2 libidn2.so.0 libintl.so.8 liblber.so.2 \
638 libldap.so.2 libnghttp2.so.14 libsasl2.so.3 \ 638 libldap.so.2 libnghttp2.so.14 libsasl2.so.3 \
639 libssh2.so.1 libunistring.so.5; do \ 639 libssh2.so.1 libunistring.so.5; do \
640 ${CP} ${PREFIX}/lib/$${lib} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \ 640 ${CP} ${PREFIX}/lib/$${lib} ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/; \
641 done; \ 641 done; \
642 for f in ${BOOTSTRAP_TMPDIR}/bin/*; do \ 642 for f in ${BOOTSTRAP_TMPDIR}/bin/*; do \
643 /bin/file -b "$$f" | grep ^ELF >/dev/null || continue; \ 643 /bin/file -b "$$f" | grep ^ELF >/dev/null || continue; \
644 ${ELFEDIT} -e 'dyn:runpath $$ORIGIN/../lib:$$ORIGIN/../lib/pkgsrc' $$f; \ 644 ${ELFEDIT} -e 'dyn:runpath $$ORIGIN/../lib:$$ORIGIN/../lib/pkgsrc' $$f; \
645 done; \ 645 done; \
646 for f in ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/*.so*; do \ 646 for f in ${BOOTSTRAP_TMPDIR}/lib/pkgsrc/*.so*; do \
647 ${ELFEDIT} -e 'dyn:runpath $$ORIGIN' $$f; \ 647 ${ELFEDIT} -e 'dyn:runpath $$ORIGIN' $$f; \