Fri Apr 19 14:08:39 2024 UTC (37d)
lang/rust-bin: Fix build on Darwin

rust-analyzer(1) also got @rpath. Fix it too.


(pho)
diff -r1.64 -r1.65 pkgsrc/lang/rust-bin/Makefile

cvs diff -r1.64 -r1.65 pkgsrc/lang/rust-bin/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust-bin/Makefile 2024/04/18 09:36:01 1.64
+++ pkgsrc/lang/rust-bin/Makefile 2024/04/19 14:08:39 1.65
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.64 2024/04/18 09:36:01 pin Exp $ 1# $NetBSD: Makefile,v 1.65 2024/04/19 14:08:39 pho Exp $
2 2
3DISTNAME= rust-1.76.0 3DISTNAME= rust-1.76.0
4PKGNAME= ${DISTNAME:S/rust/rust-bin/1} 4PKGNAME= ${DISTNAME:S/rust/rust-bin/1}
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= https://static.rust-lang.org/dist/ 6MASTER_SITES= https://static.rust-lang.org/dist/
7DIST_SUBDIR= ${PKGNAME_NOREV} 7DIST_SUBDIR= ${PKGNAME_NOREV}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://rust-lang.org/ 10HOMEPAGE= https://rust-lang.org/
11COMMENT= Safe, concurrent, practical language (pre-built distribution) 11COMMENT= Safe, concurrent, practical language (pre-built distribution)
12LICENSE= mit OR apache-2.0 12LICENSE= mit OR apache-2.0
13 13
14CONFLICTS+= rust-[0-9]* 14CONFLICTS+= rust-[0-9]*
@@ -202,27 +202,27 @@ WRKSRC:= ${WRKSRC:C/netbsd90/netbsd/} @@ -202,27 +202,27 @@ WRKSRC:= ${WRKSRC:C/netbsd90/netbsd/}
202do-install: 202do-install:
203 cd ${.CURDIR}/files; pax -rw install.sh ${WRKSRC} 203 cd ${.CURDIR}/files; pax -rw install.sh ${WRKSRC}
204 cd ${WRKSRC} && env PKGMANDIR=${PKGMANDIR} bash ./install.sh \ 204 cd ${WRKSRC} && env PKGMANDIR=${PKGMANDIR} bash ./install.sh \
205 --destdir=${DESTDIR} --prefix=${PREFIX} 205 --destdir=${DESTDIR} --prefix=${PREFIX}
206 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/rust-llvm-dwp 206 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/rust-llvm-dwp
207 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/install.log 207 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/install.log
208 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/manifest-* 208 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/manifest-*
209 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/uninstall.sh 209 ${RM} -f ${DESTDIR}${PREFIX}/lib/rustlib/uninstall.sh
210 210
211.if ${OPSYS} == "Darwin" 211.if ${OPSYS} == "Darwin"
212.PHONY: fix-darwin-install-name 212.PHONY: fix-darwin-install-name
213post-install: fix-darwin-install-name 213post-install: fix-darwin-install-name
214fix-darwin-install-name: 214fix-darwin-install-name:
215. for bin in clippy-driver miri rls rustc rustdoc 215. for bin in clippy-driver miri rls rust-analyzer rustc rustdoc
216 otool -XL ${DESTDIR}${PREFIX}/bin/${bin} \ 216 otool -XL ${DESTDIR}${PREFIX}/bin/${bin} \
217 | ${GREP} '@rpath' | while read rpath rest; do \ 217 | ${GREP} '@rpath' | while read rpath rest; do \
218 install_name_tool -change $$rpath \ 218 install_name_tool -change $$rpath \
219 `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib,g'` \ 219 `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib,g'` \
220 ${DESTDIR}${PREFIX}/bin/${bin}; \ 220 ${DESTDIR}${PREFIX}/bin/${bin}; \
221 done 221 done
222. endfor 222. endfor
223. for bin in lldb lldb-mi llvm-nm llvm-objcopy llvm-objdump \ 223. for bin in lldb lldb-mi llvm-nm llvm-objcopy llvm-objdump \
224 llvm-profdata llvm-readobj llvm-size llvm-strip 224 llvm-profdata llvm-readobj llvm-size llvm-strip
225 otool -XL ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin} \ 225 otool -XL ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin} \
226 | ${GREP} '@rpath' | while read rpath rest; do \ 226 | ${GREP} '@rpath' | while read rpath rest; do \
227 install_name_tool -change $$rpath \ 227 install_name_tool -change $$rpath \
228 `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib/rustlib/${RUST_ARCH}/lib,g'` \ 228 `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib/rustlib/${RUST_ARCH}/lib,g'` \