diff options
author | he <he@pkgsrc.org> | 2020-05-25 17:53:21 +0000 |
---|---|---|
committer | he <he@pkgsrc.org> | 2020-05-25 17:53:21 +0000 |
commit | aab5e70acbb41bd852878bc0e3feeaa1f674d672 (patch) | |
tree | 115f580fe22fcff8be64e2477862265229469988 /lang/rust-bin/Makefile | |
parent | 890e7e037b741b9fc0ee156916f016c684852ebd (diff) | |
download | pkgsrc-aab5e70acbb41bd852878bc0e3feeaa1f674d672.tar.gz |
The ld.elf_so in NetBSD/8.x only obeys RPATH, not RUNPATH,
so fix to force RPATH usage on that platform.
Bump PKGREVISION for good measure.
Diffstat (limited to 'lang/rust-bin/Makefile')
-rw-r--r-- | lang/rust-bin/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lang/rust-bin/Makefile b/lang/rust-bin/Makefile index a788cc61d79..471ae617287 100644 --- a/lang/rust-bin/Makefile +++ b/lang/rust-bin/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2020/05/19 22:23:16 nia Exp $ +# $NetBSD: Makefile,v 1.6 2020/05/25 17:53:21 he Exp $ DISTNAME= rust-1.42.0 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/ +PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://rust-lang.org/ @@ -123,30 +124,33 @@ fix-darwin-install-name: .else TOOL_DEPENDS+= patchelf-[0-9]*:../../devel/patchelf +# ld.elf_so in NetBSD 8.x only obeys RPATH, not RUNPATH, so force RPATH there. +FORCE_RPATH= # The llvm utilities need a specific libstdc++ version from compat80 . if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) RUST_LLVM_RPATH= ${PREFIX}/emul/netbsd/usr/lib:${PREFIX}/lib . else RUST_LLVM_RPATH= ${PREFIX}/lib +FORCE_RPATH= --force-rpath . endif .PHONY: fix-relative-rpath post-install: fix-relative-rpath fix-relative-rpath: . for bin in cargo-miri clippy-driver miri rls rustc rustdoc - ${PREFIX}/bin/patchelf --set-rpath \ + ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath \ ${PREFIX}/lib ${DESTDIR}${PREFIX}/bin/${bin} . endfor . for bin in llvm-ar llvm-nm llvm-objcopy llvm-objdump llvm-profdata \ llvm-readobj llvm-size llvm-strip - ${PREFIX}/bin/patchelf --set-rpath ${RUST_LLVM_RPATH} \ + ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${RUST_LLVM_RPATH} \ ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin} . endfor . for lib in lib lib/rustlib/${RUST_ARCH}/lib \ lib/rustlib/${RUST_ARCH}/codegen-backends for f in ${DESTDIR}${PREFIX}/${lib}/lib*.so; do \ [ ! -f $$f ] && continue; \ - ${PREFIX}/bin/patchelf --set-rpath ${PREFIX}/lib $$f; \ + ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${PREFIX}/lib $$f; \ done . endfor .endif |