 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.195 2020/09/25 12:21:02 gdt Exp $
+# $NetBSD: Makefile,v 1.195.2.1 2020/10/04 09:26:08 bsiegert Exp $
 DISTNAME=	rustc-1.45.2-src
 PKGNAME=	${DISTNAME:S/rustc/rust/:S/-src//}
 PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	https://static.rust-lang.org/dist/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.rust-lang.org/
 COMMENT=	Safe, concurrent, practical language
 LICENSE=	mit OR apache-2.0
 CONFLICTS+=	rust-bin-[0-9]*
 @@ -111,29 +111,29 @@ CONFIGURE_ARGS+=	--set llvm.targets="ARM
 #   http://mail-index.netbsd.org/source-changes/2020/04/19/msg116337.html
 # These  were pulled up to netbsd-9 on 2020-05-13:
 #   http://releng.netbsd.org/cgi-bin/req-9.cgi?show=907
 # This has not been pulled up to netbsd-8
 #   \todo Explain if it's not applicable, shouldn't be pulled up, should be
 #   but hasn't, is too hard, etc.
+#
 # On pkgbuild for 2020Q1 9.0_RELEASE amd64, rust did not build despite
 # MAKE_JOBS_SAFE=no, but setting MAKE_JOBS=1 resulted in success. (No
 # PR is open for this.)  \todo Understand and fix.
+#
 # If we aren't on 9-current, and are on 8.x or 9.x, avoid parallel.
 # \todo Consider avoiding setting this on netbsd-9 past the fix.
-.  if ${MACHINE_PLATFORM:MNetBSD-[1-9].*} && !${MACHINE_PLATFORM:MNetBSD-9.99.*}
+#.  if ${MACHINE_PLATFORM:MNetBSD-[1-9].*} && !${MACHINE_PLATFORM:MNetBSD-9.99.*}
-MAKE_JOBS_SAFE=	no
+#MAKE_JOBS_SAFE=	no
-.  endif
+#.  endif
 # Open PRs
+#
 # Broken package with PREFIX not /usr/pkg:
 #   http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54453
+#
 # NetBSD 8.1 earmv7hf: unknown configure option
 #   http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=54621
+#
 # NetBSD 9 i386: bootstrap fails with missing libcurl.so.4
 #   http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=55368
 # Stale PRs (a reason to believe they no longer apply)
 @@ -515,30 +515,36 @@ stage0-bootstrap: install
 # https://github.com/rust-lang/rust/issues/65862)
 .if (${OPSYS} == "NetBSD") && \
 		((${MACHINE_ARCH} == "i386") || \
 		 (${MACHINE_ARCH} == "sparc64") || \
 		 (${MACHINE_ARCH} == "powerpc")) \
 	&& (empty(OS_VERSION:M[012345678].*) || \
 	    !empty(OS_VERSION:M8.99.*))
 # Bootstrap kits are built on 8.0, so that a single bootstrap can run
 # on multiple systems.  Thus later versions need the compat80 package.
 # \todo Explain why this is limited to a small list of architectures,
 # and in particular why not x86_64.
 DEPENDS+=	compat80>=0:../../emulators/compat80
 .endif
 .if (${OPSYS} == "NetBSD") && \
 		((${MACHINE_ARCH} == "i386")) \
 	&& (empty(OS_VERSION:M[012345678].*) || \
 	    !empty(OS_VERSION:M8.99.*))
 # Bootstrap kits use openssl, which on NetBSD 8 comes from pkgsrc.
 # Therefore the pkgsrc openssl libs need to be present as well.
-# (Observed on i386, and presumed true on the other
+# The 1.44.1 i686 bootstrap links with pkgsrc openssl.  The others do
-# bootstrap-built-for-8 systems.)  Then, when the package is built,
+# not.  When the package is built,
 # cargo links against pkgsrc openssl, so it must be a run-time
 # dependency as well.  Forcing USE_BUILTIN.openssl=no results in a
 # mysterious heimdal error, but straight DEPENDS seems to result in a
 # satisfactory package build.
 # While this is icky, it is for the time being better than no rust package.
 DEPENDS+=	openssl>=1.1:../../security/openssl
 .endif
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/tool.mk"
 .include "../../security/openssl/buildlink3.mk"
 BUILDLINK_API_DEPENDS.curl+= curl>=7.67.0
 .include "../../www/curl/buildlink3.mk"