pkgsrc-WIP-changes archive

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

rust: reduce diff to main pkgsrc: * configure with --disable-docs * Ensure Darwin is >= 10.7 as that is required * Add compat80 dependency on i386 != 8.*



Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Sat Nov 20 16:08:19 2021 +0100
Changeset:	1619b6a69e50d06ab9b08fa200e59d7b956c5eac

Modified Files:
	rust/Makefile

Log Message:
rust: reduce diff to main pkgsrc:
 * configure with --disable-docs
 * Ensure Darwin is >= 10.7 as that is required
 * Add compat80 dependency on i386 != 8.*

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1619b6a69e50d06ab9b08fa200e59d7b956c5eac

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

diffstat:
 rust/Makefile | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diffs:
diff --git a/rust/Makefile b/rust/Makefile
index 744cd6ccca..33947b3253 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -41,14 +41,12 @@ CONFIGURE_ARGS+=		--local-rust-root=${RUST_BOOTSTRAP_PATH}
 CONFIGURE_ARGS+=		--enable-extended	# Build and install cargo too.
 CONFIGURE_ARGS+=		--enable-rpath
 CONFIGURE_ARGS+=		--disable-codegen-tests
+CONFIGURE_ARGS+=		--disable-docs
 CONFIGURE_ARGS+=		--disable-compiler-docs
 CONFIGURE_ARGS+=		--disable-dist-src
 CONFIGURE_ARGS+=		--disable-llvm-static-stdcpp
 CONFIGURE_ARGS+=		--disable-ninja
 
-# Work around gcc10 lossage related to BITWORDS_PER_ELEMENT analysis
-#CONFIGURE_ARGS+=		--set llvm.cxxflags=-Wno-error=array-bounds
-
 # Include (optional) settings to cross-build rust
 .include "cross.mk"
 
@@ -64,6 +62,10 @@ CONFIGURE_ARGS+=	--enable-vendor
 # cargo defaults to using the number of available CPUs
 MAKE_ENV+=		CARGO_BUILD_JOBS=${_MAKE_JOBS_N}
 
+# MacOS X 10.7 is the oldest supported version. See
+# ${WRKSRC}/src/bootstrap/lib.rs
+MAKE_ENV.Darwin+=	MACOSX_DEPLOYMENT_TARGET="10.7"
+
 CFLAGS.SunOS+=		-D_POSIX_PTHREAD_SEMANTICS
 
 UNLIMIT_RESOURCES+=	cputime datasize virtualsize
@@ -588,6 +590,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)


Home | Main Index | Thread Index | Old Index