Sat Apr 24 08:28:00 2021 UTC ()
Add another post-install dylib rpath fixup for macOS (libserde_derive).
Bump PKGREVISION.


(schmonz)
diff -r1.233 -r1.234 pkgsrc/lang/rust/Makefile
cvs diff -r1.233 -r1.234 pkgsrc/lang/rust/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust/Makefile 2021/04/23 11:41:55 1.233
+++ pkgsrc/lang/rust/Makefile 2021/04/24 08:27:59 1.234
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.233 2021/04/23 11:41:55 nia Exp $ 1# $NetBSD: Makefile,v 1.234 2021/04/24 08:27:59 schmonz Exp $
2 2
3DISTNAME= rustc-1.50.0-src 3DISTNAME= rustc-1.50.0-src
4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} 4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= https://static.rust-lang.org/dist/ 7MASTER_SITES= https://static.rust-lang.org/dist/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.rust-lang.org/ 10HOMEPAGE= https://www.rust-lang.org/
11COMMENT= Safe, concurrent, practical language 11COMMENT= Safe, concurrent, practical language
12LICENSE= mit OR apache-2.0 12LICENSE= mit OR apache-2.0
13 13
14CONFLICTS+= rust-bin-[0-9]* 14CONFLICTS+= rust-bin-[0-9]*
15 15
16# uses -std=c++14 16# uses -std=c++14
17GCC_REQD+= 5 17GCC_REQD+= 5
18 18
@@ -448,26 +448,27 @@ do-test: @@ -448,26 +448,27 @@ do-test:
448 448
449do-install: 449do-install:
450 ${RUN}${_ULIMIT_CMD} \ 450 ${RUN}${_ULIMIT_CMD} \
451 cd ${WRKSRC} && \ 451 cd ${WRKSRC} && \
452 ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} \ 452 ${SETENV} ${MAKE_ENV} ${INSTALL_ENV} \
453 ${PYTHONBIN} ./x.py -v install -j ${_MAKE_JOBS_N} 453 ${PYTHONBIN} ./x.py -v install -j ${_MAKE_JOBS_N}
454 454
455.if ${OPSYS} == "Darwin" 455.if ${OPSYS} == "Darwin"
456.PHONY: fix-darwin-install-name 456.PHONY: fix-darwin-install-name
457post-install: fix-darwin-install-name 457post-install: fix-darwin-install-name
458fix-darwin-install-name: 458fix-darwin-install-name:
459 for f in ${DESTDIR}${PREFIX}/lib/librustc_macros-*.dylib \ 459 for f in ${DESTDIR}${PREFIX}/lib/librustc_macros-*.dylib \
460 ${DESTDIR}${PREFIX}/lib/libtracing_attributes-*.dylib \ 460 ${DESTDIR}${PREFIX}/lib/libtracing_attributes-*.dylib \
 461 ${DESTDIR}${PREFIX}/lib/libserde_derive-*.dylib \
461 ${DESTDIR}${PREFIX}/lib/libchalk_derive-*.dylib; do \ 462 ${DESTDIR}${PREFIX}/lib/libchalk_derive-*.dylib; do \
462 install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \ 463 install_name_tool -id `${ECHO} $$f | ${SED} -e 's,${DESTDIR},,g'` $$f; \
463 done 464 done
464.endif 465.endif
465 466
466GENERATE_PLIST+= ${FIND} ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \ 467GENERATE_PLIST+= ${FIND} ${DESTDIR}${PREFIX} \( -type f -o -type l \) -print | \
467 ${SED} -e 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ; 468 ${SED} -e 's,${DESTDIR}${PREFIX}/,,' | ${SORT} ;
468 469
469# Create a relocatable stage2 bootstrap from the bits we just built that can be 470# Create a relocatable stage2 bootstrap from the bits we just built that can be
470# used to build the next version of rust. Currently only tested on SmartOS. 471# used to build the next version of rust. Currently only tested on SmartOS.
471# 472#
472# Use the alternate BOOTSTRAP_NAME when creating a nightly release. 473# Use the alternate BOOTSTRAP_NAME when creating a nightly release.
473# 474#