Thu Oct 29 07:51:08 2020 UTC ()
Pullup ticket #6329 (part 2) - requested by maya
lang/rust: NetBSD 9 build fix (accidentally broken)


(bsiegert)
diff -r1.195.2.1 -r1.195.2.2 pkgsrc/lang/rust/Makefile
cvs diff -r1.195.2.1 -r1.195.2.2 pkgsrc/lang/rust/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/rust/Makefile 2020/10/04 09:26:08 1.195.2.1
+++ pkgsrc/lang/rust/Makefile 2020/10/29 07:51:08 1.195.2.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.195.2.1 2020/10/04 09:26:08 bsiegert Exp $ 1# $NetBSD: Makefile,v 1.195.2.2 2020/10/29 07:51:08 bsiegert Exp $
2 2
3DISTNAME= rustc-1.45.2-src 3DISTNAME= rustc-1.45.2-src
4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//} 4PKGNAME= ${DISTNAME:S/rustc/rust/:S/-src//}
5PKGREVISION= 2 5PKGREVISION= 2
6CATEGORIES= lang 6CATEGORIES= lang
7MASTER_SITES= https://static.rust-lang.org/dist/ 7MASTER_SITES= https://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
14CONFLICTS+= rust-bin-[0-9]* 14CONFLICTS+= rust-bin-[0-9]*
@@ -111,29 +111,29 @@ CONFIGURE_ARGS+= --set llvm.targets="ARM @@ -111,29 +111,29 @@ CONFIGURE_ARGS+= --set llvm.targets="ARM
111# http://mail-index.netbsd.org/source-changes/2020/04/19/msg116337.html 111# http://mail-index.netbsd.org/source-changes/2020/04/19/msg116337.html
112# These were pulled up to netbsd-9 on 2020-05-13: 112# These were pulled up to netbsd-9 on 2020-05-13:
113# http://releng.netbsd.org/cgi-bin/req-9.cgi?show=907 113# http://releng.netbsd.org/cgi-bin/req-9.cgi?show=907
114# This has not been pulled up to netbsd-8 114# This has not been pulled up to netbsd-8
115# \todo Explain if it's not applicable, shouldn't be pulled up, should be 115# \todo Explain if it's not applicable, shouldn't be pulled up, should be
116# but hasn't, is too hard, etc. 116# but hasn't, is too hard, etc.
117# 117#
118# On pkgbuild for 2020Q1 9.0_RELEASE amd64, rust did not build despite 118# On pkgbuild for 2020Q1 9.0_RELEASE amd64, rust did not build despite
119# MAKE_JOBS_SAFE=no, but setting MAKE_JOBS=1 resulted in success. (No 119# MAKE_JOBS_SAFE=no, but setting MAKE_JOBS=1 resulted in success. (No
120# PR is open for this.) \todo Understand and fix. 120# PR is open for this.) \todo Understand and fix.
121# 121#
122# If we aren't on 9-current, and are on 8.x or 9.x, avoid parallel. 122# If we aren't on 9-current, and are on 8.x or 9.x, avoid parallel.
123# \todo Consider avoiding setting this on netbsd-9 past the fix. 123# \todo Consider avoiding setting this on netbsd-9 past the fix.
124#. if ${MACHINE_PLATFORM:MNetBSD-[1-9].*} && !${MACHINE_PLATFORM:MNetBSD-9.99.*} 124. if ${MACHINE_PLATFORM:MNetBSD-[1-9].*} && !${MACHINE_PLATFORM:MNetBSD-9.99.*}
125#MAKE_JOBS_SAFE= no 125MAKE_JOBS_SAFE= no
126#. endif 126. endif
127 127
128# Open PRs 128# Open PRs
129# 129#
130# Broken package with PREFIX not /usr/pkg: 130# Broken package with PREFIX not /usr/pkg:
131# http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54453 131# http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54453
132# 132#
133# NetBSD 8.1 earmv7hf: unknown configure option 133# NetBSD 8.1 earmv7hf: unknown configure option
134# http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54621 134# http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54621
135# 135#
136# NetBSD 9 i386: bootstrap fails with missing libcurl.so.4 136# NetBSD 9 i386: bootstrap fails with missing libcurl.so.4
137# http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=55368 137# http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=55368
138 138
139# Stale PRs (a reason to believe they no longer apply) 139# Stale PRs (a reason to believe they no longer apply)