CVS commit: pkgsrc/lang/rust

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Apr 15 00:55:45 UTC 2021

Modified Files:
        pkgsrc/lang/rust: Makefile

Log Message:
rust: restore NetBSD i386 bootstrap workaround

The current i386 bootstrap is built for NetBSD 8.x, and so is linked
against libstdc++.so.8. NetBSD 9.x still requires compat80 for it to
run.

This isn't a complete workaround, as builds still fail in a sandboxed
environment that doesn't have compat80 installed outside it. Dealing
with that would require another workaround somewhat like the one used
for ghc*, but a little different.


To generate a diff of this commit:
cvs rdiff -u -r1.227 -r1.228 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.227 pkgsrc/lang/rust/Makefile:1.228
--- pkgsrc/lang/rust/Makefile:1.227     Sun Apr  4 17:49:42 2021
+++ pkgsrc/lang/rust/Makefile   Thu Apr 15 00:55:45 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.227 2021/04/04 17:49:42 he Exp $
+# $NetBSD: Makefile,v 1.228 2021/04/15 00:55:45 gutteridge Exp $
 
 DISTNAME=      rustc-1.49.0-src
 PKGNAME=       ${DISTNAME:S/rustc/rust/:S/-src//}
@@ -531,6 +531,14 @@ stage0-bootstrap: install
 #.include "../../www/http-parser/buildlink3.mk"
 #.include "../../devel/jemalloc/buildlink3.mk"
 
+## Issues specific to: bootstrap AND NetBSD follow
+
+# rust i386 bootstraps are built for 8.0 and still depend on libstdc++.so.8.
+# Pull in compat80 on 9.x and newer.
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) && empty(OS_VERSION:M8.*)
+DEPENDS+=      compat80>=0:../../emulators/compat80
+.endif
+
 # This is for when we build natively:
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \
     !empty(MACHINE_PLATFORM:MNetBSD-*-i386)