pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/rust rust: restore NetBSD i386 bootstrap workaround



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d4343c17abdf
branches:  trunk
changeset: 450341:d4343c17abdf
user:      gutteridge <gutteridge%pkgsrc.org@localhost>
date:      Thu Apr 15 00:55:45 2021 +0000

description:
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.

diffstat:

 lang/rust/Makefile |  10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diffs (24 lines):

diff -r e63db884fa63 -r d4343c17abdf lang/rust/Makefile
--- a/lang/rust/Makefile        Wed Apr 14 22:39:25 2021 +0000
+++ b/lang/rust/Makefile        Thu Apr 15 00:55:45 2021 +0000
@@ -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 @@
 #.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)



Home | Main Index | Thread Index | Old Index