Wed Jul 15 15:13:57 2020 UTC ()
urst-bin: Correct sense of condition


(nia)
diff -r1.9 -r1.10 pkgsrc/lang/rust-bin/Makefile
cvs diff -r1.9 -r1.10 pkgsrc/lang/rust-bin/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust-bin/Makefile 2020/06/14 15:33:28 1.9
+++ pkgsrc/lang/rust-bin/Makefile 2020/07/15 15:13:57 1.10
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.9 2020/06/14 15:33:28 nia Exp $ 1# $NetBSD: Makefile,v 1.10 2020/07/15 15:13:57 nia Exp $
2 2
3DISTNAME= rust-1.44.0 3DISTNAME= rust-1.44.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/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://rust-lang.org/ 9HOMEPAGE= https://rust-lang.org/
10COMMENT= Safe, concurrent, practical language (official binaries) 10COMMENT= Safe, concurrent, practical language (official binaries)
11LICENSE= mit OR apache-2.0 11LICENSE= mit OR apache-2.0
12 12
13CONFLICTS+= rust-[0-9]* 13CONFLICTS+= rust-[0-9]*
14 14
@@ -141,27 +141,27 @@ FORCE_RPATH= --force-rpath @@ -141,27 +141,27 @@ FORCE_RPATH= --force-rpath
141. endif 141. endif
142 142
143.PHONY: fix-relative-rpath 143.PHONY: fix-relative-rpath
144post-install: fix-relative-rpath 144post-install: fix-relative-rpath
145fix-relative-rpath: 145fix-relative-rpath:
146. for bin in cargo-miri clippy-driver miri rls rustc rustdoc 146. for bin in cargo-miri clippy-driver miri rls rustc rustdoc
147 if [ -f ${DESTDIR}${PREFIX}/bin/${bin} ]; then \ 147 if [ -f ${DESTDIR}${PREFIX}/bin/${bin} ]; then \
148 ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath \ 148 ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath \
149 ${PREFIX}/lib ${DESTDIR}${PREFIX}/bin/${bin} \ 149 ${PREFIX}/lib ${DESTDIR}${PREFIX}/bin/${bin} \
150 ; fi 150 ; fi
151. endfor 151. endfor
152. for bin in llvm-ar llvm-nm llvm-objcopy llvm-objdump llvm-profdata \ 152. for bin in llvm-ar llvm-nm llvm-objcopy llvm-objdump llvm-profdata \
153 llvm-readobj llvm-size llvm-strip 153 llvm-readobj llvm-size llvm-strip
154 if [ -f ${DESTDIR}${PREFIX}/bin/${bin} ]; then \ 154 if [ -f ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin} ]; then \
155 ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${RUST_LLVM_RPATH} \ 155 ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${RUST_LLVM_RPATH} \
156 ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin} \ 156 ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin} \
157 ; fi 157 ; fi
158. endfor 158. endfor
159. for lib in lib lib/rustlib/${RUST_ARCH}/lib \ 159. for lib in lib lib/rustlib/${RUST_ARCH}/lib \
160 lib/rustlib/${RUST_ARCH}/codegen-backends 160 lib/rustlib/${RUST_ARCH}/codegen-backends
161 for f in ${DESTDIR}${PREFIX}/${lib}/lib*.so; do \ 161 for f in ${DESTDIR}${PREFIX}/${lib}/lib*.so; do \
162 [ ! -f $$f ] && continue; \ 162 [ ! -f $$f ] && continue; \
163 ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${PREFIX}/lib $$f; \ 163 ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${PREFIX}/lib $$f; \
164 done 164 done
165. endfor 165. endfor
166.endif 166.endif
167 167