Mon Jul 6 16:03:00 2020 UTC ()
Remove more of the cross-compile settings now consigned to my
own private cross.mk file.


(he)
diff -r1.182 -r1.183 pkgsrc/lang/rust/Makefile
cvs diff -r1.182 -r1.183 pkgsrc/lang/rust/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust/Makefile 2020/07/06 13:56:31 1.182
+++ pkgsrc/lang/rust/Makefile 2020/07/06 16:03:00 1.183
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.182 2020/07/06 13:56:31 he Exp $ 1# $NetBSD: Makefile,v 1.183 2020/07/06 16:03:00 he Exp $
2 2
3DISTNAME= rustc-1.44.0-src 3DISTNAME= rustc-1.44.1-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
13CONFLICTS+= rust-bin-[0-9]* 13CONFLICTS+= rust-bin-[0-9]*
14 14
15# uses -std=c++14 15# uses -std=c++14
16GCC_REQD+= 5 16GCC_REQD+= 5
@@ -62,47 +62,26 @@ MAKE_ENV+= CARGO_BUILD_JOBS=${_MAKE_JOB @@ -62,47 +62,26 @@ MAKE_ENV+= CARGO_BUILD_JOBS=${_MAKE_JOB
62 62
63CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS 63CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
64 64
65UNLIMIT_RESOURCES+= cputime datasize virtualsize 65UNLIMIT_RESOURCES+= cputime datasize virtualsize
66 66
67TEST_TARGET= check 67TEST_TARGET= check
68 68
69# bin/* lib/*, but names vary 69# bin/* lib/*, but names vary
70CHECK_RELRO_SUPPORTED= no 70CHECK_RELRO_SUPPORTED= no
71CHECK_SSP_SUPPORTED= no 71CHECK_SSP_SUPPORTED= no
72 72
73.include "../../mk/bsd.prefs.mk" 73.include "../../mk/bsd.prefs.mk"
74 74
75.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \ 
76 !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) 
77# Bootstrapping on NetBSD/powerpc requires no debug-info from rustc 
78# (both for amd64->powerpc built and powerpc->powerpc built bootstrap bits) 
79CONFIGURE_ARGS+= --disable-debug 
80CONFIGURE_ARGS+= --disable-debug-assertions 
81CONFIGURE_ARGS+= --disable-llvm-release-debuginfo 
82CONFIGURE_ARGS+= --debuginfo-level=0 
83CONFIGURE_ARGS+= --debuginfo-level-rustc=0 
84CONFIGURE_ARGS+= --debuginfo-level-std=0 
85CONFIGURE_ARGS+= --debuginfo-level-tools=0 
86CONFIGURE_ARGS+= --debuginfo-level-tests=0 
87.endif 
88 
89# Only build the ARM target on/for this host, due to resource constraints 
90# (X86 needs to go along due to 2-stage build process) 
91.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || \ 
92 !empty(TARGET:Marmv7-unknown-netbsd-eabihf) 
93CONFIGURE_ARGS+= --set llvm.targets="ARM;X86" 
94.endif 
95 
96.if ${OPSYS} == "NetBSD" 75.if ${OPSYS} == "NetBSD"
97# This block contains information about known trouble on NetBSD and workarounds. 76# This block contains information about known trouble on NetBSD and workarounds.
98 77
99# Parallel builds failed on NetBSD due to dynamic linker locking bugs. 78# Parallel builds failed on NetBSD due to dynamic linker locking bugs.
100# \todo Explain if the build is believed to be sound if not parallel, 79# \todo Explain if the build is believed to be sound if not parallel,
101# or if a non-parallel build is merely more likely to work. 80# or if a non-parallel build is merely more likely to work.
102# 81#
103# See toolchain/54192 at 82# See toolchain/54192 at
104# http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54192 83# http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54192
105# which was fixed in -current on 2020-04-19: 84# which was fixed in -current on 2020-04-19:
106# http://mail-index.netbsd.org/source-changes/2020/04/16/msg116256.html 85# http://mail-index.netbsd.org/source-changes/2020/04/16/msg116256.html
107# http://mail-index.netbsd.org/source-changes/2020/04/19/msg116337.html 86# http://mail-index.netbsd.org/source-changes/2020/04/19/msg116337.html
108# These were pulled up to netbsd-9 on 2020-05-13: 87# These were pulled up to netbsd-9 on 2020-05-13: