Wed Jun 3 10:45:04 2020 UTC ()
rust*: Add PKG_SKIP_REASON depending on the value of RUST_TYPE


(nia)
diff -r1.170 -r1.171 pkgsrc/lang/rust/Makefile
diff -r1.6 -r1.7 pkgsrc/lang/rust-bin/Makefile
cvs diff -r1.170 -r1.171 pkgsrc/lang/rust/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust/Makefile 2020/05/24 16:58:43 1.170
+++ pkgsrc/lang/rust/Makefile 2020/06/03 10:45:04 1.171
@@ -1,35 +1,41 @@ @@ -1,35 +1,41 @@
1# $NetBSD: Makefile,v 1.170 2020/05/24 16:58:43 triaxx Exp $ 1# $NetBSD: Makefile,v 1.171 2020/06/03 10:45:04 nia Exp $
2 2
3DISTNAME= rustc-1.43.1-src 3DISTNAME= rustc-1.43.1-src
4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} 4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= http://static.rust-lang.org/dist/ 7MASTER_SITES= http://static.rust-lang.org/dist/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.rust-lang.org/ 10HOMEPAGE= https://www.rust-lang.org/
11COMMENT= Safe, concurrent, practical language 11COMMENT= Safe, concurrent, practical language
12LICENSE= mit OR apache-2.0 12LICENSE= mit OR apache-2.0
13 13
14USE_GCC_RUNTIME= yes 14USE_GCC_RUNTIME= yes
15USE_LANGUAGES= c c++11 15USE_LANGUAGES= c c++11
16USE_LIBTOOL= yes 16USE_LIBTOOL= yes
17USE_TOOLS+= bash ggrep gmake perl:build pkg-config 17USE_TOOLS+= bash ggrep gmake perl:build pkg-config
18 18
19# The NetBSD bootstraps are built for NetBSD 8 (because rust doesn't 19# The NetBSD bootstraps are built for NetBSD 8 (because rust doesn't
20# build on 7). Mark earlier versions as broken. 20# build on 7). Mark earlier versions as broken.
21BROKEN_ON_PLATFORM+= NetBSD-[1-7].*-* 21BROKEN_ON_PLATFORM+= NetBSD-[1-7].*-*
22 22
 23.include "type.mk"
 24
 25.if ${RUST_TYPE} != "src"
 26PKG_SKIP_REASON+= "Rust source package, RUST_TYPE is bin"
 27.endif
 28
23HAS_CONFIGURE= yes 29HAS_CONFIGURE= yes
24PYTHON_FOR_BUILD_ONLY= yes 30PYTHON_FOR_BUILD_ONLY= yes
25CONFIG_SHELL= ${PYTHONBIN} 31CONFIG_SHELL= ${PYTHONBIN}
26CONFIGURE_SCRIPT= src/bootstrap/configure.py 32CONFIGURE_SCRIPT= src/bootstrap/configure.py
27CONFIGURE_ARGS+= --prefix=${PREFIX} 33CONFIGURE_ARGS+= --prefix=${PREFIX}
28CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} 34CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
29CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 35CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
30CONFIGURE_ARGS+= --python=${PYTHONBIN} 36CONFIGURE_ARGS+= --python=${PYTHONBIN}
31CONFIGURE_ARGS+= --release-channel=stable 37CONFIGURE_ARGS+= --release-channel=stable
32#CONFIGURE_ARGS+= --enable-local-rust 38#CONFIGURE_ARGS+= --enable-local-rust
33CONFIGURE_ARGS+= --local-rust-root=${RUST_BOOTSTRAP_PATH} 39CONFIGURE_ARGS+= --local-rust-root=${RUST_BOOTSTRAP_PATH}
34CONFIGURE_ARGS+= --enable-extended # Build and install cargo too. 40CONFIGURE_ARGS+= --enable-extended # Build and install cargo too.
35CONFIGURE_ARGS+= --enable-rpath 41CONFIGURE_ARGS+= --enable-rpath
cvs diff -r1.6 -r1.7 pkgsrc/lang/rust-bin/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust-bin/Makefile 2020/05/25 17:53:21 1.6
+++ pkgsrc/lang/rust-bin/Makefile 2020/06/03 10:45:04 1.7
@@ -1,25 +1,31 @@ @@ -1,25 +1,31 @@
1# $NetBSD: Makefile,v 1.6 2020/05/25 17:53:21 he Exp $ 1# $NetBSD: Makefile,v 1.7 2020/06/03 10:45:04 nia Exp $
2 2
3DISTNAME= rust-1.42.0 3DISTNAME= rust-1.42.0
4CATEGORIES= lang 4CATEGORIES= lang
5MASTER_SITES= https://static.rust-lang.org/dist/ 5MASTER_SITES= https://static.rust-lang.org/dist/
6PKGREVISION= 1 6PKGREVISION= 1
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
 13.include "../../lang/rust/type.mk"
 14
 15.if ${RUST_TYPE} != "bin"
 16PKG_SKIP_REASON+= "Rust binary package, RUST_TYPE is src"
 17.endif
 18
13ONLY_FOR_PLATFORM+= Darwin-*-x86_64 19ONLY_FOR_PLATFORM+= Darwin-*-x86_64
14ONLY_FOR_PLATFORM+= FreeBSD-*-i386 20ONLY_FOR_PLATFORM+= FreeBSD-*-i386
15ONLY_FOR_PLATFORM+= FreeBSD-*-x86_64 21ONLY_FOR_PLATFORM+= FreeBSD-*-x86_64
16ONLY_FOR_PLATFORM+= NetBSD-*-x86_64 22ONLY_FOR_PLATFORM+= NetBSD-*-x86_64
17ONLY_FOR_PLATFORM+= Linux-*-aarch64 23ONLY_FOR_PLATFORM+= Linux-*-aarch64
18ONLY_FOR_PLATFORM+= Linux-*-i386 24ONLY_FOR_PLATFORM+= Linux-*-i386
19ONLY_FOR_PLATFORM+= Linux-*-x86_64 25ONLY_FOR_PLATFORM+= Linux-*-x86_64
20 26
21CHECK_RELRO_SKIP+= lib/rustlib/x86_64-unknown-netbsd/bin/llvm-ar 27CHECK_RELRO_SKIP+= lib/rustlib/x86_64-unknown-netbsd/bin/llvm-ar
22CHECK_RELRO_SKIP+= lib/rustlib/x86_64-unknown-netbsd/bin/llvm-nm 28CHECK_RELRO_SKIP+= lib/rustlib/x86_64-unknown-netbsd/bin/llvm-nm
23CHECK_RELRO_SKIP+= lib/rustlib/x86_64-unknown-netbsd/bin/llvm-objcopy 29CHECK_RELRO_SKIP+= lib/rustlib/x86_64-unknown-netbsd/bin/llvm-objcopy
24CHECK_RELRO_SKIP+= lib/rustlib/x86_64-unknown-netbsd/bin/llvm-objdump 30CHECK_RELRO_SKIP+= lib/rustlib/x86_64-unknown-netbsd/bin/llvm-objdump
25CHECK_RELRO_SKIP+= lib/rustlib/x86_64-unknown-netbsd/bin/llvm-profdata 31CHECK_RELRO_SKIP+= lib/rustlib/x86_64-unknown-netbsd/bin/llvm-profdata