Fri Oct 13 12:42:12 2017 UTC ()
Do not hardcode RUST_ARCH


(ryoon)
diff -r1.13 -r1.14 pkgsrc/lang/rust/Makefile
diff -r1.2 -r1.3 pkgsrc/lang/rust/files/config.toml
cvs diff -r1.13 -r1.14 pkgsrc/lang/rust/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust/Makefile 2017/10/07 17:40:27 1.13
+++ pkgsrc/lang/rust/Makefile 2017/10/13 12:42:12 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.13 2017/10/07 17:40:27 maya Exp $ 1# $NetBSD: Makefile,v 1.14 2017/10/13 12:42:12 ryoon Exp $
2 2
3DISTNAME= rustc-1.20.0-src 3DISTNAME= rustc-1.20.0-src
4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} 4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
5CATEGORIES= lang 5CATEGORIES= lang
6MASTER_SITES= http://static.rust-lang.org/dist/ 6MASTER_SITES= http://static.rust-lang.org/dist/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.rust-lang.org/ 9HOMEPAGE= https://www.rust-lang.org/
10COMMENT= Safe, concurrent, practical language 10COMMENT= Safe, concurrent, practical language
11LICENSE= mit OR apache-2.0 11LICENSE= mit OR apache-2.0
12 12
13USE_GCC_RUNTIME= yes 13USE_GCC_RUNTIME= yes
14USE_LANGUAGES= c c++11 14USE_LANGUAGES= c c++11
@@ -111,27 +111,27 @@ SUBST_STAGE.rpath= post-patch @@ -111,27 +111,27 @@ SUBST_STAGE.rpath= post-patch
111SUBST_FILES.rpath= src/bootstrap/bin/rustc.rs 111SUBST_FILES.rpath= src/bootstrap/bin/rustc.rs
112SUBST_VARS.rpath= PREFIX 112SUBST_VARS.rpath= PREFIX
113 113
114post-extract: 114post-extract:
115 ${MV} ${WRKDIR}/rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}/rust-std-${RUST_ARCH}/lib/rustlib/${RUST_ARCH} \ 115 ${MV} ${WRKDIR}/rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}/rust-std-${RUST_ARCH}/lib/rustlib/${RUST_ARCH} \
116 ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}/rustc/lib/rustlib 116 ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}/rustc/lib/rustlib
117 117
118RUSTC= ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}/rustc/bin/rustc 118RUSTC= ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}/rustc/bin/rustc
119CARGO= ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}/cargo/bin/cargo 119CARGO= ${WRKDIR}/rust-${RUST_STAGE0_VER}-${RUST_ARCH}/cargo/bin/cargo
120 120
121SUBST_CLASSES+= config 121SUBST_CLASSES+= config
122SUBST_STAGE.config= post-configure 122SUBST_STAGE.config= post-configure
123SUBST_FILES.config+= config.toml 123SUBST_FILES.config+= config.toml
124SUBST_VARS.config+= RUSTC CARGO PREFIX PYTHONBIN 124SUBST_VARS.config+= RUSTC CARGO PREFIX PYTHONBIN RUST_ARCH
125 125
126do-configure: 126do-configure:
127 ${CP} ${FILESDIR}/config.toml ${WRKSRC}/config.toml 127 ${CP} ${FILESDIR}/config.toml ${WRKSRC}/config.toml
128 128
129do-build: 129do-build:
130 cd ${WRKSRC} \ 130 cd ${WRKSRC} \
131 && env ${MAKE_ENV} \ 131 && env ${MAKE_ENV} \
132 ${PYTHONBIN} ./x.py dist 132 ${PYTHONBIN} ./x.py dist
133 133
134do-install: 134do-install:
135 cd ${WRKSRC} \ 135 cd ${WRKSRC} \
136 && env ${MAKE_ENV} ${INSTALL_ENV} \ 136 && env ${MAKE_ENV} ${INSTALL_ENV} \
137 ${PYTHONBIN} ./x.py install 137 ${PYTHONBIN} ./x.py install
cvs diff -r1.2 -r1.3 pkgsrc/lang/rust/files/Attic/config.toml (expand / switch to unified diff)

--- pkgsrc/lang/rust/files/Attic/config.toml 2017/10/13 12:33:02 1.2
+++ pkgsrc/lang/rust/files/Attic/config.toml 2017/10/13 12:42:12 1.3
@@ -8,15 +8,15 @@ verbose = 2 @@ -8,15 +8,15 @@ verbose = 2
8[install] 8[install]
9prefix = "@PREFIX@" 9prefix = "@PREFIX@"
10sysconfdir = "" 10sysconfdir = ""
11mandir = "man" 11mandir = "man"
12[rust] 12[rust]
13channel = "stable" 13channel = "stable"
14rpath = true 14rpath = true
15codegen-tests = false 15codegen-tests = false
16[dist] 16[dist]
17src-tarball = false 17src-tarball = false
18[llvm] 18[llvm]
19static-libstdcpp = false 19static-libstdcpp = false
20ninja = false 20ninja = false
21[target.x86_64-unknown-netbsd] 21[target.@RUST_ARCH@]
22llvm-config = "@PREFIX@/bin/llvm-config" 22llvm-config = "@PREFIX@/bin/llvm-config"