Received: by mail.netbsd.org (Postfix, from userid 605) id 3621784D7F; Tue, 18 May 2021 18:00:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6D9E484D72 for ; Tue, 18 May 2021 18:00:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id EJvn9TYY4o8z for ; Tue, 18 May 2021 18:00:01 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7D3ED84D0F for ; Tue, 18 May 2021 18:00:01 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 71A57FA95; Tue, 18 May 2021 18:00:01 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1621360801242820" MIME-Version: 1.0 Date: Tue, 18 May 2021 18:00:01 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/lang/rust-bin To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210518180001.71A57FA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1621360801242820 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue May 18 18:00:01 UTC 2021 Modified Files: pkgsrc/lang/rust-bin: Makefile distinfo Log Message: rust-bin: add support for ARM, PowerPC, SPARC To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 pkgsrc/lang/rust-bin/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/rust-bin/distinfo Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1621360801242820 Content-Disposition: inline Content-Length: 9155 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/rust-bin/Makefile diff -u pkgsrc/lang/rust-bin/Makefile:1.17 pkgsrc/lang/rust-bin/Makefile:1.18 --- pkgsrc/lang/rust-bin/Makefile:1.17 Sun Apr 25 10:50:57 2021 +++ pkgsrc/lang/rust-bin/Makefile Tue May 18 18:00:01 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2021/04/25 10:50:57 nia Exp $ +# $NetBSD: Makefile,v 1.18 2021/05/18 18:00:01 nia Exp $ DISTNAME= rust-1.50.0 PKGNAME= ${DISTNAME:S/rust/rust-bin/1} @@ -8,11 +8,12 @@ DIST_SUBDIR= ${PKGNAME_NOREV} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= https://rust-lang.org/ -COMMENT= Safe, concurrent, practical language (official binaries) +COMMENT= Safe, concurrent, practical language (pre-built distribution) LICENSE= mit OR apache-2.0 CONFLICTS+= rust-[0-9]* +# Rust upstream provided binaries ONLY_FOR_PLATFORM+= Darwin-*-x86_64 ONLY_FOR_PLATFORM+= FreeBSD-*-x86_64 ONLY_FOR_PLATFORM+= NetBSD-*-x86_64 @@ -20,12 +21,23 @@ ONLY_FOR_PLATFORM+= Linux-*-aarch64 ONLY_FOR_PLATFORM+= Linux-*-i386 ONLY_FOR_PLATFORM+= Linux-*-x86_64 +# he@NetBSD.org provided binaries +ONLY_FOR_PLATFORM+= NetBSD-*-aarch64 +ONLY_FOR_PLATFORM+= NetBSD-*-earmv7hf +ONLY_FOR_PLATFORM+= NetBSD-*-i386 +ONLY_FOR_PLATFORM+= NetBSD-*-powerpc +ONLY_FOR_PLATFORM+= NetBSD-*-sparc64 + CHECK_RELRO_SKIP+= lib/rustlib/*/bin/* # The NetBSD bootstraps are built for NetBSD 8 (because rust doesn't # build on 7). Mark earlier versions as broken. BROKEN_ON_PLATFORM+= NetBSD-[1-7].*-* +# Bootstraps built for 9.0. +BROKEN_ON_PLATFORM+= NetBSD-8.*-earmv7hf +BROKEN_ON_PLATFORM+= NetBSD-8.*-powerpc + NO_BUILD= yes USE_TOOLS+= bash WRKSRC= ${WRKDIR}/${DISTFILES:S/.tar.gz//} @@ -39,6 +51,8 @@ INSTALLATION_DIRS= bin ${PKGMANDIR} shar DISTFILES:= # empty +# Rust upstream provided binaries + .if !empty(MACHINE_PLATFORM:MDarwin-*-x86_64) || make(distinfo) || make(makesum) || make(mdi) RUST_ARCH:= x86_64-apple-darwin DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz @@ -72,6 +86,39 @@ RUST_ARCH:= x86_64-unknown-netbsd DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz .endif +# NetBSD provided binaries + +.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo) || make(makesum) || make(mdi) +RUST_ARCH:= aarch64-unknown-netbsd +DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz +SITES.${DISTNAME}-${RUST_ARCH}.tar.gz= \ + https://cdn.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/rust/ +.endif +.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || make(distinfo) || make(makesum) || make(mdi) +RUST_ARCH:= armv7-unknown-netbsd-eabihf +DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz +SITES.${DISTNAME}-${RUST_ARCH}.tar.gz= \ + https://cdn.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/rust/ +.endif +.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo) || make(makesum) || make(mdi) +RUST_ARCH:= i586-unknown-netbsd +DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz +.endif +SITES.${DISTNAME}-${RUST_ARCH}.tar.gz= \ + https://cdn.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/rust/ +.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make(makesum) || make(mdi) +RUST_ARCH:= powerpc-unknown-netbsd +DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz +SITES.${DISTNAME}-${RUST_ARCH}.tar.gz= \ + https://cdn.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/rust/ +.endif +.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo) || make(makesum) || make(mdi) +RUST_ARCH:= sparc64-unknown-netbsd +DISTFILES:= ${DISTFILES} ${DISTNAME}-${RUST_ARCH}.tar.gz +SITES.${DISTNAME}-${RUST_ARCH}.tar.gz= \ + https://cdn.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/rust/ +.endif + do-install: cd ${WRKSRC} && env PKGMANDIR=${PKGMANDIR} bash ./install.sh \ --destdir=${DESTDIR} --prefix=${PREFIX} @@ -117,15 +164,25 @@ TOOL_DEPENDS+= patchelf-[0-9]*:../../de # The llvm utilities need a specific libstdc++ version from compat80 . if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) +. if ${MACHINE_ARCH} != "aarch64" && ${MACHINE_ARCH} != "earmv7hf" && \ + ${MACHINE_ARCH} != "powerpc" DEPENDS+= compat80-[0-9]*:../../emulators/compat80 RUST_LLVM_RPATH= ${PREFIX}/emul/netbsd/usr/lib:${PREFIX}/lib FORCE_RPATH= +. else +RUST_LLVM_RPATH= ${PREFIX}/lib +. endif . 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 . endif +.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \ + !empty(MACHINE_PLATFORM:MNetBSD-*-i386) +. include "../../devel/libatomic/buildlink3.mk" +.endif + .PHONY: fix-relative-rpath post-install: fix-relative-rpath fix-relative-rpath: Index: pkgsrc/lang/rust-bin/distinfo diff -u pkgsrc/lang/rust-bin/distinfo:1.6 pkgsrc/lang/rust-bin/distinfo:1.7 --- pkgsrc/lang/rust-bin/distinfo:1.6 Sun Apr 25 10:50:57 2021 +++ pkgsrc/lang/rust-bin/distinfo Tue May 18 18:00:01 2021 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2021/04/25 10:50:57 nia Exp $ +$NetBSD: distinfo,v 1.7 2021/05/18 18:00:01 nia Exp $ SHA1 (rust-bin-1.50.0/rust-1.50.0-aarch64-unknown-linux-gnu.tar.gz) = 3f078e2e2f55e43ba98cb2acd21d40e5e9cc49a8 RMD160 (rust-bin-1.50.0/rust-1.50.0-aarch64-unknown-linux-gnu.tar.gz) = 3847eaaa8072efe27b0e7411795d98aa6fca0003 @@ -8,10 +8,30 @@ SHA1 (rust-bin-1.50.0/rust-1.50.0-aarch6 RMD160 (rust-bin-1.50.0/rust-1.50.0-aarch64-unknown-linux-musl.tar.gz) = 7fd519f1d6abca7f3177a47a64d1138d3ef4b617 SHA512 (rust-bin-1.50.0/rust-1.50.0-aarch64-unknown-linux-musl.tar.gz) = 8a9d73f3c79546bb80847cf1218f2cbfa77997a409233a69feae5e7221602f37de042fed6c13274f36b27051c92fcf771076a3183f91c4f1fe85c8ceea1e1485 Size (rust-bin-1.50.0/rust-1.50.0-aarch64-unknown-linux-musl.tar.gz) = 314799917 bytes +SHA1 (rust-bin-1.50.0/rust-1.50.0-aarch64-unknown-netbsd.tar.gz) = bb36673c48642da22f608c091aae54e334c6592c +RMD160 (rust-bin-1.50.0/rust-1.50.0-aarch64-unknown-netbsd.tar.gz) = 63c54020bd0b97ad344b0f07e331cd735fc8a375 +SHA512 (rust-bin-1.50.0/rust-1.50.0-aarch64-unknown-netbsd.tar.gz) = 76153bf8295de8c994289648c2458492ac0c771696f85a9d1d3ab7c6bb08626f9876cad1fd270000742305f3bd334d294ade76a477149a02c9100807e350a4e2 +Size (rust-bin-1.50.0/rust-1.50.0-aarch64-unknown-netbsd.tar.gz) = 282637715 bytes +SHA1 (rust-bin-1.50.0/rust-1.50.0-armv7-unknown-netbsd-eabihf.tar.gz) = 8c78af0b9300e738cd44c8d85226bdb4b277db3c +RMD160 (rust-bin-1.50.0/rust-1.50.0-armv7-unknown-netbsd-eabihf.tar.gz) = b0dc7748ed8315c61ef56e3bdd25ec9ccc8cc12a +SHA512 (rust-bin-1.50.0/rust-1.50.0-armv7-unknown-netbsd-eabihf.tar.gz) = 14e60642262493cb6492945caa6cd25c179328e7e8e0791fbb887411b28989619d2ea80d8cdf9496de1d2f1bfea280fcd8696357f12ec7cbe496a0c8b76a7c0e +Size (rust-bin-1.50.0/rust-1.50.0-armv7-unknown-netbsd-eabihf.tar.gz) = 259036239 bytes +SHA1 (rust-bin-1.50.0/rust-1.50.0-i586-unknown-netbsd.tar.gz) = f0c3693dda70151825777669bf23538e3ceb6367 +RMD160 (rust-bin-1.50.0/rust-1.50.0-i586-unknown-netbsd.tar.gz) = 02995dd3f6dc114162c42a9ad072dffdd2e756b5 +SHA512 (rust-bin-1.50.0/rust-1.50.0-i586-unknown-netbsd.tar.gz) = b51e6e17b4b81c3885450554aff816d7e0264fa09ffc97c66def20a72a0980451a5c26c12cdc52ff077be77656ab5d986ff2b8ebed6a24355fd76b5479faeb41 +Size (rust-bin-1.50.0/rust-1.50.0-i586-unknown-netbsd.tar.gz) = 316871159 bytes SHA1 (rust-bin-1.50.0/rust-1.50.0-i686-unknown-linux-gnu.tar.gz) = f946618c821caab5c58dd3eb2a3af42cf486c3dd RMD160 (rust-bin-1.50.0/rust-1.50.0-i686-unknown-linux-gnu.tar.gz) = a299095db6fc1a2160415087638a35b0bc02cd95 SHA512 (rust-bin-1.50.0/rust-1.50.0-i686-unknown-linux-gnu.tar.gz) = 13d3e71bf88fc92ffd7f2c5a59e151dcd0e25e1b9256a107d96ab3110bab698b1294fe7dcbc4f3a847c37666e54a6183c41a8320ddbbcd5ebe907e13e7f5c1bc Size (rust-bin-1.50.0/rust-1.50.0-i686-unknown-linux-gnu.tar.gz) = 360543712 bytes +SHA1 (rust-bin-1.50.0/rust-1.50.0-powerpc-unknown-netbsd.tar.gz) = 6f58b67c3487186e47e6cf12b9ab13562a0724b3 +RMD160 (rust-bin-1.50.0/rust-1.50.0-powerpc-unknown-netbsd.tar.gz) = 60f565681f2cbed690c1551c7648609cfcb5148d +SHA512 (rust-bin-1.50.0/rust-1.50.0-powerpc-unknown-netbsd.tar.gz) = 4e5db0d3a5aff3b67c5ec988e6d632fd81dc5cc305aa14bba595de28f3154d13fdcfea6fc69f4a5264220bf471fab1add8ae089a87a05427d7a3a936749941bb +Size (rust-bin-1.50.0/rust-1.50.0-powerpc-unknown-netbsd.tar.gz) = 313628339 bytes +SHA1 (rust-bin-1.50.0/rust-1.50.0-sparc64-unknown-netbsd.tar.gz) = 72b6d9e81ea186a049fa83bdcce973faf1bb91db +RMD160 (rust-bin-1.50.0/rust-1.50.0-sparc64-unknown-netbsd.tar.gz) = c26dafe0cdf12cce0b9314eacb2fe8a513a4ccdd +SHA512 (rust-bin-1.50.0/rust-1.50.0-sparc64-unknown-netbsd.tar.gz) = e990096d3b253522818cdd1fe6624b567e9d679d1e4c55fa1392805128b073d55334bc13c9d48e6a7befabb3673c098332e24b7b6e2a07d82eb4181228ab5d90 +Size (rust-bin-1.50.0/rust-1.50.0-sparc64-unknown-netbsd.tar.gz) = 298912500 bytes SHA1 (rust-bin-1.50.0/rust-1.50.0-x86_64-apple-darwin.tar.gz) = 2f381659e8988f70dbfd593c0e40f69102d1b057 RMD160 (rust-bin-1.50.0/rust-1.50.0-x86_64-apple-darwin.tar.gz) = 2933afe5b9fee6662b63d6db5fdc81a6618be250 SHA512 (rust-bin-1.50.0/rust-1.50.0-x86_64-apple-darwin.tar.gz) = 0d1466b3667d48049decf77ce0887b79e4f322a5e48832cefd6f038f67d8868286db2b1d03a2f75012d0e0e663506ef21566877ab625fc047528af617a9b845a --_----------=_1621360801242820--