Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1601396668214360"
MIME-Version: 1.0
Date: Tue, 29 Sep 2020 16:24:28 +0000
From: "Greg Troxel" <gdt@netbsd.org>
Subject: CVS commit: pkgsrc/lang/rust
To: pkgsrc-changes@NetBSD.org
Reply-To: gdt@netbsd.org
Message-Id: <20200929162428.B5235FB28@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1601396668214360
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gdt
Date:		Tue Sep 29 16:24:28 UTC 2020

Modified Files:
	pkgsrc/lang/rust: Makefile

Log Message:
lang/rust: Adjust openssl bootstrap depends (NetBSD only)

On NetBSD, further limit the DEPENDS on openssl to i386.  It turns out
that the sparc64 and powerpc bootstraps are not linked against openssl
as I previously assumed.

No change to limiting this DEPENDS to 9+.  No change to any other OS.

This change is believed to fix rust building on NetBSD 9 sparc64.

As discussed on tech-pkg@.


To generate a diff of this commit:
cvs rdiff -u -r1.195 -r1.196 pkgsrc/lang/rust/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1601396668214360
Content-Disposition: inline
Content-Length: 1373
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/rust/Makefile
diff -u pkgsrc/lang/rust/Makefile:1.195 pkgsrc/lang/rust/Makefile:1.196
--- pkgsrc/lang/rust/Makefile:1.195	Fri Sep 25 12:21:02 2020
+++ pkgsrc/lang/rust/Makefile	Tue Sep 29 16:24:28 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.195 2020/09/25 12:21:02 gdt Exp $
+# $NetBSD: Makefile,v 1.196 2020/09/29 16:24:28 gdt Exp $
 
 DISTNAME=	rustc-1.45.2-src
 PKGNAME=	${DISTNAME:S/rustc/rust/:S/-src//}
@@ -525,10 +525,16 @@ stage0-bootstrap: install
 # \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
-# bootstrap-built-for-8 systems.)  Then, when the package is built,
+# The 1.44.1 i686 bootstrap links with pkgsrc openssl.  The others do
+# 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


--_----------=_1601396668214360--