Fri Dec 10 19:00:35 2021 UTC ()
rust-bin: fix Linux packaging


(gutteridge)
diff -r1.30 -r1.31 pkgsrc/lang/rust-bin/Makefile
cvs diff -r1.30 -r1.31 pkgsrc/lang/rust-bin/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust-bin/Makefile 2021/11/30 14:40:00 1.30
+++ pkgsrc/lang/rust-bin/Makefile 2021/12/10 19:00:35 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.30 2021/11/30 14:40:00 gdt Exp $ 1# $NetBSD: Makefile,v 1.31 2021/12/10 19:00:35 gutteridge Exp $
2 2
3DISTNAME= rust-1.56.1 3DISTNAME= rust-1.56.1
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]*
@@ -205,27 +205,27 @@ FORCE_RPATH= --force-rpath @@ -205,27 +205,27 @@ FORCE_RPATH= --force-rpath
205.PHONY: fix-relative-rpath 205.PHONY: fix-relative-rpath
206post-install: fix-relative-rpath 206post-install: fix-relative-rpath
207fix-relative-rpath: 207fix-relative-rpath:
208. for bin in clippy-driver miri rls rustc rustdoc 208. for bin in clippy-driver miri rls rustc rustdoc
209 if [ -f ${DESTDIR}${PREFIX}/bin/${bin} ]; then \ 209 if [ -f ${DESTDIR}${PREFIX}/bin/${bin} ]; then \
210 ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath \ 210 ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath \
211 ${PREFIX}/lib ${DESTDIR}${PREFIX}/bin/${bin} ; \ 211 ${PREFIX}/lib ${DESTDIR}${PREFIX}/bin/${bin} ; \
212 fi 212 fi
213. endfor 213. endfor
214# Only Linux builds link these binaries against an LLVM library 214# Only Linux builds link these binaries against an LLVM library
215. if ${OPSYS} == "Linux" 215. if ${OPSYS} == "Linux"
216. for bin in llc llvm-ar llvm-as llvm-cov llvm-dis llvm-nm llvm-objcopy \ 216. for bin in llc llvm-ar llvm-as llvm-cov llvm-dis llvm-nm llvm-objcopy \
217 llvm-objdump llvm-profdata llvm-readobj llvm-size llvm-strip opt \ 217 llvm-objdump llvm-profdata llvm-readobj llvm-size llvm-strip opt \
218 rust-lld gcc-ld/rust-lld 218 rust-lld gcc-ld/ld gcc-ld/ld64
219 ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${RUST_LLVM_RPATH} \ 219 ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${RUST_LLVM_RPATH} \
220 ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin} 220 ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin}
221. endfor 221. endfor
222. endif 222. endif
223. for lib in lib lib/rustlib/${RUST_ARCH}/lib \ 223. for lib in lib lib/rustlib/${RUST_ARCH}/lib \
224 lib/rustlib/${RUST_ARCH}/codegen-backends 224 lib/rustlib/${RUST_ARCH}/codegen-backends
225 for f in ${DESTDIR}${PREFIX}/${lib}/lib*.so; do \ 225 for f in ${DESTDIR}${PREFIX}/${lib}/lib*.so; do \
226 [ ! -f $$f ] && continue; \ 226 [ ! -f $$f ] && continue; \
227 ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${PREFIX}/lib $$f; \ 227 ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${PREFIX}/lib $$f; \
228 done 228 done
229. endfor 229. endfor
230.endif 230.endif
231 231