Thu Apr 30 18:12:19 2020 UTC ()
rust: netbsd/i386 bootstrap has text relocations, paxctl +m it


(maya)
diff -r1.160 -r1.161 pkgsrc/lang/rust/Makefile
cvs diff -r1.160 -r1.161 pkgsrc/lang/rust/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust/Makefile 2020/04/20 13:22:31 1.160
+++ pkgsrc/lang/rust/Makefile 2020/04/30 18:12:19 1.161
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.160 2020/04/20 13:22:31 joerg Exp $ 1# $NetBSD: Makefile,v 1.161 2020/04/30 18:12:19 maya Exp $
2 2
3DISTNAME= rustc-1.42.0-src 3DISTNAME= rustc-1.42.0-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
@@ -211,26 +211,27 @@ RUST_STAGE0_VER= 1.41.1 @@ -211,26 +211,27 @@ RUST_STAGE0_VER= 1.41.1
211RUST_ARCH= i686-unknown-netbsd 211RUST_ARCH= i686-unknown-netbsd
212RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 212RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
213RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 213RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
214SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 214SITES.${RUST_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
215SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/} 215SITES.${RUST_STD_STAGE0}= ${MASTER_SITE_LOCAL:=rust/}
216DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 216DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
217# Setting this changes it for every distfile, which doesn't match what is 217# Setting this changes it for every distfile, which doesn't match what is
218# currently in distinfo. 218# currently in distinfo.
219#DIST_SUBDIR= ${PKGNAME} 219#DIST_SUBDIR= ${PKGNAME}
220# For atomic ops 220# For atomic ops
221CFLAGS+= -march=i586 221CFLAGS+= -march=i586
222pre-build-fix: 222pre-build-fix:
223 ${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/cargo 223 ${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/cargo
 224 ${TOOLS_PLATFORM.paxctl} +am ${WRKDIR}/rust-bootstrap/bin/rustc
224.endif 225.endif
225.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi) 226.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo) || make (makesum) || make(mdi)
226RUST_STAGE0_VER= 1.41.1 227RUST_STAGE0_VER= 1.41.1
227RUST_ARCH= x86_64-unknown-netbsd 228RUST_ARCH= x86_64-unknown-netbsd
228RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 229RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
229RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 230RUST_STD_STAGE0:= rust-std-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz
230DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0} 231DISTFILES:= ${DISTFILES} ${RUST_STAGE0} ${RUST_STD_STAGE0}
231pre-build-fix: 232pre-build-fix:
232.endif 233.endif
233.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make (makesum) || make(mdi) 234.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || make(distinfo) || make (makesum) || make(mdi)
234RUST_STAGE0_VER= 1.41.1 235RUST_STAGE0_VER= 1.41.1
235RUST_ARCH= powerpc-unknown-netbsd 236RUST_ARCH= powerpc-unknown-netbsd
236RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz 237RUST_STAGE0:= rust-${RUST_STAGE0_VER}-${RUST_ARCH}.tar.gz