Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_160094531286630"
MIME-Version: 1.0
Date: Thu, 24 Sep 2020 11:01:52 +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: <20200924110152.10CFEFB28@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	gdt
Date:		Thu Sep 24 11:01:51 UTC 2020

Modified Files:
	pkgsrc/lang/rust: Makefile

Log Message:
lang/rust: On NetBSD >=9, bl3 on openssl

On NetBSD i386 (and sparc64 and powerpc), we have bootstrap kits that
are linked against pkgsrc openssl.  Previously rust BUILD_DEPENDed on
openssl so they could run but this resulted in an installed cargo that
linked against that openssl.  This changes the depend method to
straight bl3, so openssl will be a runtime dependency.

This continues to be icky, but after a long period of discussion on
the lists, no other this-branch fixes to make NetBSD 9/i386 be able to
build rust have been suggested, and further there no objections.

It is expected that the bootstrap process will be rototilled after
2020Q3 is cut; this situation is obviously not a good one to continue.


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

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


--_----------=_160094531286630
Content-Disposition: inline
Content-Length: 1001
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.193 pkgsrc/lang/rust/Makefile:1.194
--- pkgsrc/lang/rust/Makefile:1.193	Sun Sep 20 22:50:21 2020
+++ pkgsrc/lang/rust/Makefile	Thu Sep 24 11:01:51 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.193 2020/09/20 22:50:21 gdt Exp $
+# $NetBSD: Makefile,v 1.194 2020/09/24 11:01:51 gdt Exp $
 
 DISTNAME=	rustc-1.45.2-src
 PKGNAME=	${DISTNAME:S/rustc/rust/:S/-src//}
@@ -528,8 +528,9 @@ DEPENDS+=	compat80>=0:../../emulators/co
 # 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.
-BUILD_DEPENDS+=	openssl>1.1:../../security/openssl
+# bootstrap-built-for-8 systems.  It also is linked against by cargo,
+# so it must be a run-time dependency as well.
+.include "../../security/openssl/buildlink3.mk"
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"


--_----------=_160094531286630--