diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2021-04-24 12:48:46 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2021-04-24 12:48:46 +0000 |
| commit | 656f97cf6b81bd825dd2b73fc18c4b9a939899fa (patch) | |
| tree | f49f20a72b14133ed52a8d1f06020055631ec37f | |
| parent | 999a250f447b72e934e6a7c63e94e8f23a5a7483 (diff) | |
| download | pkgsrc-656f97cf6b81bd825dd2b73fc18c4b9a939899fa.tar.gz | |
Pullup ticket #6446 - requested by gutteridge
lang/rust: NetBSD/i386 build fix
Revisions pulled up:
- lang/rust/Makefile 1.228-1.229
---
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.
---
Module Name: pkgsrc
Committed By: gutteridge
Date: Fri Apr 16 01:14:37 UTC 2021
Modified Files:
pkgsrc/lang/rust: Makefile
Log Message:
rust: the i386 bootstrap workaround is really a BUILD_DEPENDS
| -rw-r--r-- | lang/rust/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lang/rust/Makefile b/lang/rust/Makefile index 7275a57531e..59e92d98d55 100644 --- a/lang/rust/Makefile +++ b/lang/rust/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.220.2.1 2021/04/10 08:36:05 bsiegert Exp $ +# $NetBSD: Makefile,v 1.220.2.2 2021/04/24 12:48:46 bsiegert 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.*) +BUILD_DEPENDS+= compat80>=0:../../emulators/compat80 +.endif + # This is for when we build natively: .if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \ !empty(MACHINE_PLATFORM:MNetBSD-*-i386) |