CVS commit: pkgsrc/lang/rust

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Sep 20 22:50:21 UTC 2020

Modified Files:
        pkgsrc/lang/rust: Makefile

Log Message:
lang/rust: Build-depend on openssl, on NetBSD >8

On NetBSD >8, for several CPU types we depend on compat80, because
bootstrap kits are build for NetBSD 8.  On those, also add a
BUILD_DEPENDS on openssl, because the bootstrap kits need pkgsrc
openssl libs.

Adjust and reorganize comments (but the only functional change is the
NetBSD >8 openssl BUILD_DEPENDS).>

Resolves failure to build on NetBSD 9.

(The entire "NetBSD>8" section is a hack that can be removed with
improved bootstrap generation.)


To generate a diff of this commit:
cvs rdiff -u -r1.192 -r1.193 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.192 pkgsrc/lang/rust/Makefile:1.193
--- pkgsrc/lang/rust/Makefile:1.192     Sun Sep 20 22:30:07 2020
+++ pkgsrc/lang/rust/Makefile   Sun Sep 20 22:50:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.192 2020/09/20 22:30:07 gdt Exp $
+# $NetBSD: Makefile,v 1.193 2020/09/20 22:50:21 gdt Exp $
 
 DISTNAME=      rustc-1.45.2-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -508,18 +508,28 @@ stage0-bootstrap: install
 #.include "../../www/http-parser/buildlink3.mk"
 #.include "../../devel/jemalloc/buildlink3.mk"
 
-# Bootstrap built on 8.0, build on later version
-# requires compat80 package.
+## Issues specific to: bootstrap AND NetBSD follow
+
 # (I wish this worked on powerpc, but it doesn't since
 # I can't build with the internal LLVM, ref.
 # 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
+# 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
 .endif
 
 .include "../../devel/zlib/buildlink3.mk"