diff options
| -rw-r--r-- | lang/rust-bin/Makefile | 51 | ||||
| -rw-r--r-- | lang/rust-bin/distinfo | 70 |
2 files changed, 62 insertions, 59 deletions
diff --git a/lang/rust-bin/Makefile b/lang/rust-bin/Makefile index 818d9bf3e96..d228e6b150f 100644 --- a/lang/rust-bin/Makefile +++ b/lang/rust-bin/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2020/06/03 10:45:04 nia Exp $ +# $NetBSD: Makefile,v 1.8 2020/06/09 15:58:05 nia Exp $ -DISTNAME= rust-1.42.0 +DISTNAME= rust-1.44.0 CATEGORIES= lang MASTER_SITES= https://static.rust-lang.org/dist/ -PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://rust-lang.org/ @@ -98,21 +97,25 @@ do-install: post-install: fix-darwin-install-name fix-darwin-install-name: . for bin in cargo-miri clippy-driver miri rls rustc rustdoc - otool -XL ${DESTDIR}${PREFIX}/bin/${bin} \ - | ${GREP} '@rpath' | while read rpath rest; do \ - install_name_tool -change $$rpath \ - `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib,g'` \ - ${DESTDIR}${PREFIX}/bin/${bin}; \ - done + if [ -f ${DESTDIR}${PREFIX}/bin/${bin} ]; then \ + otool -XL ${DESTDIR}${PREFIX}/bin/${bin} \ + | ${GREP} '@rpath' | while read rpath rest; do \ + install_name_tool -change $$rpath \ + `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib,g'` \ + ${DESTDIR}${PREFIX}/bin/${bin}; \ + done \ + ; fi . endfor . for bin in lldb lldb-mi llvm-nm llvm-objcopy llvm-objdump \ llvm-profdata llvm-readobj llvm-size llvm-strip - otool -XL ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin} \ - | ${GREP} '@rpath' | while read rpath rest; do \ - install_name_tool -change $$rpath \ - `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib/rustlib/${RUST_ARCH}/lib,g'` \ - ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin}; \ - done + if [ -f ${DESTDIR}${PREFIX}/bin/${bin} ]; then \ + otool -XL ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin} \ + | ${GREP} '@rpath' | while read rpath rest; do \ + install_name_tool -change $$rpath \ + `${ECHO} $$rpath | ${SED} -e 's,@rpath,${PREFIX}/lib/rustlib/${RUST_ARCH}/lib,g'` \ + ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin}; \ + done \ + ; fi . endfor . for lib in lib lib/rustlib/${RUST_ARCH}/lib lib/rustlib/${RUST_ARCH}/codegen-backends for f in ${DESTDIR}${PREFIX}/${lib}/lib*.dylib; do \ @@ -130,27 +133,31 @@ 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 +FORCE_RPATH= . else +# ld.elf_so in NetBSD 8.x only obeys RPATH, not RUNPATH, so force RPATH there. RUST_LLVM_RPATH= ${PREFIX}/lib -FORCE_RPATH= --force-rpath +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 ${FORCE_RPATH} --set-rpath \ - ${PREFIX}/lib ${DESTDIR}${PREFIX}/bin/${bin} + if [ -f ${DESTDIR}${PREFIX}/bin/${bin} ]; then \ + ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath \ + ${PREFIX}/lib ${DESTDIR}${PREFIX}/bin/${bin} \ + ; fi . endfor . for bin in llvm-ar llvm-nm llvm-objcopy llvm-objdump llvm-profdata \ llvm-readobj llvm-size llvm-strip - ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${RUST_LLVM_RPATH} \ - ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin} + if [ -f ${DESTDIR}${PREFIX}/bin/${bin} ]; then \ + ${PREFIX}/bin/patchelf ${FORCE_RPATH} --set-rpath ${RUST_LLVM_RPATH} \ + ${DESTDIR}${PREFIX}/lib/rustlib/${RUST_ARCH}/bin/${bin} \ + ; fi . endfor . for lib in lib lib/rustlib/${RUST_ARCH}/lib \ lib/rustlib/${RUST_ARCH}/codegen-backends diff --git a/lang/rust-bin/distinfo b/lang/rust-bin/distinfo index 820a50ef940..0e0a8dcf7a5 100644 --- a/lang/rust-bin/distinfo +++ b/lang/rust-bin/distinfo @@ -1,39 +1,35 @@ -$NetBSD: distinfo,v 1.1 2020/05/18 16:17:21 nia Exp $ +$NetBSD: distinfo,v 1.2 2020/06/09 15:58:05 nia Exp $ -SHA1 (rust-1.42.0-aarch64-unknown-linux-gnu.tar.gz) = f5b32a30b6b744834be4ceed1c4eac5873dc9a4f -RMD160 (rust-1.42.0-aarch64-unknown-linux-gnu.tar.gz) = 5c313e75fe27707240772e316cf8b2b61eea5165 -SHA512 (rust-1.42.0-aarch64-unknown-linux-gnu.tar.gz) = ac4c9c21103b12e122f3f277424e74ee2572daf62da3476ed6710910fa4ecf843cb6464b05338ae50aa35e9844ad04a8c09746af8f03602c643da3673dc60d06 -Size (rust-1.42.0-aarch64-unknown-linux-gnu.tar.gz) = 153531604 bytes -SHA1 (rust-1.42.0-i686-unknown-freebsd.tar.gz) = 47c98dcff8988d8466ede45ffe4299cd293fb2b3 -RMD160 (rust-1.42.0-i686-unknown-freebsd.tar.gz) = 175cfd391535b332d658a2bdfb81895f7bfac8e5 -SHA512 (rust-1.42.0-i686-unknown-freebsd.tar.gz) = 096dee142161d669f88498b68f00e881c56fbf8ec8295e1924b70ab69f9db28e6f0faf763b9b5532333aca4ef1fd0d84c1ef0e4914c4b781fc80be299fcc9fda -Size (rust-1.42.0-i686-unknown-freebsd.tar.gz) = 120349647 bytes -SHA1 (rust-1.42.0-i686-unknown-linux-gnu.tar.gz) = e477282ac75019e0012ae062f58459affbdccae4 -RMD160 (rust-1.42.0-i686-unknown-linux-gnu.tar.gz) = 655fde440160d3a2db730148d5453b2d46f12d36 -SHA512 (rust-1.42.0-i686-unknown-linux-gnu.tar.gz) = 55ba536b2c75a48320899a79a4487db40f5a0ab54543c1eb4b19cf7600e2d6b4343ce1bcb3b77094f8885441bd1056c28afe7dd05ea751eced2071b8f07804ca -Size (rust-1.42.0-i686-unknown-linux-gnu.tar.gz) = 201205399 bytes -SHA1 (rust-1.42.0-powerpc64le-unknown-linux-gnu.tar.gz) = 479f31aa1dac6a274b9f77b927a2695e930d7edb -RMD160 (rust-1.42.0-powerpc64le-unknown-linux-gnu.tar.gz) = 152414c88625b8a2dbd622dde03e3a7695aa6612 -SHA512 (rust-1.42.0-powerpc64le-unknown-linux-gnu.tar.gz) = b9028b8aaec11c48a3d4af6a2a726ba64fcdf0e953299293a139a809db598bb9ef564febeb14b3cdb20b64bf73c14be373b6d5aacc52ae140f812ce62b4cb64f -Size (rust-1.42.0-powerpc64le-unknown-linux-gnu.tar.gz) = 171741051 bytes -SHA1 (rust-1.42.0-x86_64-apple-darwin.tar.gz) = 232c1d8d14cebef81cc6e8507ed9b5a337041237 -RMD160 (rust-1.42.0-x86_64-apple-darwin.tar.gz) = 19e4313c4cd862acb521e73b5269a25683091042 -SHA512 (rust-1.42.0-x86_64-apple-darwin.tar.gz) = 373940c7a2d2d921ca3d21c7a649c3014b1de8e04822f56c8de313ba6f610a70a559f106f7aa049bf5eaf333dde46089b2cf8e71961801788cd8eb515342cb84 -Size (rust-1.42.0-x86_64-apple-darwin.tar.gz) = 170080422 bytes -SHA1 (rust-1.42.0-x86_64-unknown-freebsd.tar.gz) = 97ce4299110d7a1c2b326980435d4b7de8cded2b -RMD160 (rust-1.42.0-x86_64-unknown-freebsd.tar.gz) = 340f704051498f718a57b70e90a06cd259bfffc0 -SHA512 (rust-1.42.0-x86_64-unknown-freebsd.tar.gz) = f9dda7103adc60c8b7c096474be7615605fa9ddf15ae035702ee8d6628b359da45f448b872bfe64c4aa2a576ca61f149f8e526b5cb608fc41120263f1b4e138c -Size (rust-1.42.0-x86_64-unknown-freebsd.tar.gz) = 120581969 bytes -SHA1 (rust-1.42.0-x86_64-unknown-linux-gnu.tar.gz) = 9f8c44701393d8c536d35d1aed5b6c72d75c7865 -RMD160 (rust-1.42.0-x86_64-unknown-linux-gnu.tar.gz) = 099d892ec9013f3492c4c3056fe53ddec6a28638 -SHA512 (rust-1.42.0-x86_64-unknown-linux-gnu.tar.gz) = 924e6a814a04ecfd566427779429eb0b27beabe854569f2df6d3e768b8b88808e41ccb7dc26484b9dde3bccfe8dbbc2018b414008bd3bdc9e5f6dd51963757af -Size (rust-1.42.0-x86_64-unknown-linux-gnu.tar.gz) = 185229723 bytes -SHA1 (rust-1.42.0-x86_64-unknown-linux-musl.tar.gz) = ca2c0ab49fd4d3b6891efa33292643293dccaa3c -RMD160 (rust-1.42.0-x86_64-unknown-linux-musl.tar.gz) = 7e1ff0b7562f4bd3a994cd22173d906389db4d10 -SHA512 (rust-1.42.0-x86_64-unknown-linux-musl.tar.gz) = 30ecf6915e22c49ec67e5c613c07c445995a81eacd4399424ecbc28bcb010cd078ee85fb46aaa29c6707e94d1b8512db4a6cbeb9124fae9df56fc47a43d6710e -Size (rust-1.42.0-x86_64-unknown-linux-musl.tar.gz) = 144668656 bytes -SHA1 (rust-1.42.0-x86_64-unknown-netbsd.tar.gz) = da70b4b20d20baa675b3400ab18751cfcd5337a9 -RMD160 (rust-1.42.0-x86_64-unknown-netbsd.tar.gz) = 5856fbf266a33e16d1446d06a1729bcbd9027e35 -SHA512 (rust-1.42.0-x86_64-unknown-netbsd.tar.gz) = 849054ed8db2181e291652ecd3a927dbc42884d5c6796a0a4d72387b5e48f371d82426c418f6e5e09dfb4dc0fc185cbe5b9c39fe3d7e133ee8739b9f5327f325 -Size (rust-1.42.0-x86_64-unknown-netbsd.tar.gz) = 125750204 bytes +SHA1 (rust-1.44.0-aarch64-unknown-linux-gnu.tar.gz) = 24970dd3121201dd3ce366ff4d49517c4bcf6dad +RMD160 (rust-1.44.0-aarch64-unknown-linux-gnu.tar.gz) = 9d91cf483c224b19567e4e89441720dee65aa6a7 +SHA512 (rust-1.44.0-aarch64-unknown-linux-gnu.tar.gz) = 574dfd875a1506f4a4b4f896684d59ab7ff5325244939b242dcbe3aed0449e5f507966e5d879da7eede081f4d9c230a708bf502ff525d3c5a318bd34eed519a4 +Size (rust-1.44.0-aarch64-unknown-linux-gnu.tar.gz) = 156675554 bytes +SHA1 (rust-1.44.0-i686-unknown-freebsd.tar.gz) = bbd0ea17117df54a6eececbd9ba8d0da2fdfd9e6 +RMD160 (rust-1.44.0-i686-unknown-freebsd.tar.gz) = e6ef30200074cbd9a531ad68156648fb5e9eccc4 +SHA512 (rust-1.44.0-i686-unknown-freebsd.tar.gz) = 74ff9075b28ce5b9eca77c0542e8b9446cc88a5db6e77886051b22ac3117c2e537fd4be1f8371e0d057f2e42456c04c51134aff81ab33efcc48516c4970da719 +Size (rust-1.44.0-i686-unknown-freebsd.tar.gz) = 123140342 bytes +SHA1 (rust-1.44.0-i686-unknown-linux-gnu.tar.gz) = 67c4ad3ce015a69e28c4676c2628de3f15e90afa +RMD160 (rust-1.44.0-i686-unknown-linux-gnu.tar.gz) = b79d29672882a477f653a24a5ff9c31517adf1b5 +SHA512 (rust-1.44.0-i686-unknown-linux-gnu.tar.gz) = b07d61f6b4c124e94d011c8eb3742309c864fedbf69df37233a7a69918487c34ce5d48eaf4d812c9f041d42bbcde0149be6310bf46bd75eed25ce52b62ecc105 +Size (rust-1.44.0-i686-unknown-linux-gnu.tar.gz) = 204511062 bytes +SHA1 (rust-1.44.0-x86_64-apple-darwin.tar.gz) = d3cf8e0088ed4ef81a6c67d75c68a53a9897e410 +RMD160 (rust-1.44.0-x86_64-apple-darwin.tar.gz) = 057cd552cabafc6addfaf827f20ac369d829009c +SHA512 (rust-1.44.0-x86_64-apple-darwin.tar.gz) = 21f7c528ef38a8dc3275749b11923439313237d01cb83c725a93e5c5746f0fc52356786bc4451cf1915594c0e151a3458b43ae80d2c82ad674255aae28c89022 +Size (rust-1.44.0-x86_64-apple-darwin.tar.gz) = 173815253 bytes +SHA1 (rust-1.44.0-x86_64-unknown-freebsd.tar.gz) = f3a2b6ec86c7e30b13d9f8a8d148657aa3137730 +RMD160 (rust-1.44.0-x86_64-unknown-freebsd.tar.gz) = 508415f47221bc6642bb5b8d9267804cd6106725 +SHA512 (rust-1.44.0-x86_64-unknown-freebsd.tar.gz) = d76db9273f1702419b5d3a6a0c8faf575d716292ee85db851441648fa8f46f382b2555953dbd25db3733e25bf5d6e3e979f081fd5b4e668f53225754c5a5bacc +Size (rust-1.44.0-x86_64-unknown-freebsd.tar.gz) = 123464670 bytes +SHA1 (rust-1.44.0-x86_64-unknown-linux-gnu.tar.gz) = dd577355e6bcf8ef67f19f77836910e90a7ab5ee +RMD160 (rust-1.44.0-x86_64-unknown-linux-gnu.tar.gz) = 465f0c4d9ec7f66868bd6c8cecbef7f12a532a6e +SHA512 (rust-1.44.0-x86_64-unknown-linux-gnu.tar.gz) = 5f13a2f069756daf03965bf183401e670b93e1264eb7c8639c4297573b2d1cbcae07d437154e6296270bfdfd155c23ded66d7c4e0a539c60ddf023a9057255c0 +Size (rust-1.44.0-x86_64-unknown-linux-gnu.tar.gz) = 188776305 bytes +SHA1 (rust-1.44.0-x86_64-unknown-linux-musl.tar.gz) = f3321e0d34fdf55800754a0300bc3da8f2c712f1 +RMD160 (rust-1.44.0-x86_64-unknown-linux-musl.tar.gz) = f2f513fdd9db61992aa433c9a61b0d05e9e5d7e9 +SHA512 (rust-1.44.0-x86_64-unknown-linux-musl.tar.gz) = 54f4dd616e7eaae906ca585aa5834cf194833caa052c04f3e296dae224da79934c7cadfa8a9ff3d89d036c2f2001690acd09514f11025f59d1a3dda62e71a7b0 +Size (rust-1.44.0-x86_64-unknown-linux-musl.tar.gz) = 171923245 bytes +SHA1 (rust-1.44.0-x86_64-unknown-netbsd.tar.gz) = 12a20c742baf3f1bed6f2b47c60476a2134e3d78 +RMD160 (rust-1.44.0-x86_64-unknown-netbsd.tar.gz) = 595fc6df2b9e16196ce491cb4f215efcf9a5909c +SHA512 (rust-1.44.0-x86_64-unknown-netbsd.tar.gz) = da3760f1f0d4901f7c5f1cf8eac1f809cc8fab78f13ca6ca3f1d5a1e57837ff6ace46f0e752a5caee165630aed0f32302550cc3fdac58be4d4e6308002d946c4 +Size (rust-1.44.0-x86_64-unknown-netbsd.tar.gz) = 128799057 bytes SHA1 (patch-install.sh) = 4dc4edcbda3c9d2b60ea51b5f83cadd5992ba786 |