CVS commit: pkgsrc/lang/rust

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Sep 25 12:21:02 UTC 2020

Modified Files:
        pkgsrc/lang/rust: Makefile

Log Message:
lang/rust: Add DEPENDS on openssl for NetBSD >=9 i386

For background, the bootstrap kits need pkgsrc openssl present to run.
Then, the built cargo links against libs from pkgsrc openssl.  One
would expect USE_BUILTIN.openssl=no to cause the later bl3 to depend
on pkgsrc openssl, and it does, but then there is a mysterious error
about not being able to buildlink heimdal.

This commit, relative to how 1.192, modifies comments and adds a
straight DEPENDS:

  DEPENDS+=     openssl>=1.1:../../security/openssl

only in the case of NetBSD, >=9, i386/sparc64/powerpc.

More or less as proposed on tech-pkg, with no responses.


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

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

Modified files:

Index: pkgsrc/lang/rust/Makefile
diff -u pkgsrc/lang/rust/Makefile:1.194 pkgsrc/lang/rust/Makefile:1.195
--- pkgsrc/lang/rust/Makefile:1.194     Thu Sep 24 11:01:51 2020
+++ pkgsrc/lang/rust/Makefile   Fri Sep 25 12:21:02 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.194 2020/09/24 11:01:51 gdt Exp $
+# $NetBSD: Makefile,v 1.195 2020/09/25 12:21:02 gdt Exp $
 
 DISTNAME=      rustc-1.45.2-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -527,10 +527,14 @@ stage0-bootstrap: install
 DEPENDS+=      compat80>=0:../../emulators/compat80
 # 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.  It also is linked against by cargo,
-# so it must be a run-time dependency as well.
-.include "../../security/openssl/buildlink3.mk"
+# (Observed on i386, and presumed true on the other
+# bootstrap-built-for-8 systems.)  Then, 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"