pkgsrc-WIP-changes archive

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

rust185: reduce diffs to lang/rust



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Mon Mar 31 22:03:59 2025 +0200
Changeset:	72222d5d087fe795ccb1a4f2d7c8e6d0c42bebf7

Modified Files:
	rust185/cross.mk
	rust185/do-cross.mk

Log Message:
rust185: reduce diffs to lang/rust

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

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

diffstat:
 rust185/cross.mk    | 24 ++++++++++++------------
 rust185/do-cross.mk | 16 ++++++++--------
 2 files changed, 20 insertions(+), 20 deletions(-)

diffs:
diff --git a/rust185/cross.mk b/rust185/cross.mk
index deb6283f53..47f2b3e006 100644
--- a/rust185/cross.mk
+++ b/rust185/cross.mk
@@ -20,10 +20,10 @@
 #CROSS_ROOT=		/u/evbarm64
 #CROSS_ROOT=		/u/evbarm64eb
 #CROSS_ROOT=		/u/i386
-CROSS_ROOT=		/u/mipsel
+#CROSS_ROOT=		/u/mipsel
 #CROSS_ROOT=		/u/riscv64
 #CROSS_ROOT=		/
-MAKE_ENV+=		CROSS_ROOT=${CROSS_ROOT}
+#MAKE_ENV+=		CROSS_ROOT=${CROSS_ROOT}
 
 # The GNU cross target designation
 #GNU_CROSS_TARGET=	armv7--netbsdelf-eabihf
@@ -33,9 +33,9 @@ MAKE_ENV+=		CROSS_ROOT=${CROSS_ROOT}
 #GNU_CROSS_TARGET=	aarch64--netbsd
 #GNU_CROSS_TARGET=	aarch64_be--netbsd
 #GNU_CROSS_TARGET=	i486--netbsdelf
-GNU_CROSS_TARGET=	mipsel--netbsd
+#GNU_CROSS_TARGET=	mipsel--netbsd
 #GNU_CROSS_TARGET=	riscv64--netbsd
-MAKE_ENV+=		GNU_CROSS_TARGET=${GNU_CROSS_TARGET}
+#MAKE_ENV+=		GNU_CROSS_TARGET=${GNU_CROSS_TARGET}
 
 # To cross-build rust, you need to specify
 # the ultimate target to built for, as well as the
@@ -49,17 +49,17 @@ MAKE_ENV+=		GNU_CROSS_TARGET=${GNU_CROSS_TARGET}
 #TARGET=		aarch64_be-unknown-netbsd
 #TARGET=		i686-unknown-netbsd
 #TARGET=		i586-unknown-netbsd
-TARGET=		mipsel-unknown-netbsd
+#TARGET=		mipsel-unknown-netbsd
 #TARGET=		riscv64gc-unknown-netbsd
 #
-SCRIPTS=		${WRKDIR}/scripts
-CONFIGURE_ARGS+=	--host=${TARGET}
-CONFIGURE_ARGS+=	--target=${TARGET}
-CONFIGURE_ARGS+=	--set=target.${TARGET}.cc=${SCRIPTS}/gcc-wrap
-CONFIGURE_ARGS+=	--set=target.${TARGET}.cxx=${SCRIPTS}/c++-wrap
-CONFIGURE_ARGS+=	--set=target.${TARGET}.linker=${SCRIPTS}/gcc-wrap
+#SCRIPTS=		${WRKDIR}/scripts
+#CONFIGURE_ARGS+=	--host=${TARGET}
+#CONFIGURE_ARGS+=	--target=${TARGET}
+#CONFIGURE_ARGS+=	--set=target.${TARGET}.cc=${SCRIPTS}/gcc-wrap
+#CONFIGURE_ARGS+=	--set=target.${TARGET}.cxx=${SCRIPTS}/c++-wrap
+#CONFIGURE_ARGS+=	--set=target.${TARGET}.linker=${SCRIPTS}/gcc-wrap
 # Pick one:
-CONFIGURE_ARGS+=	--set=target.${TARGET}.ar=${CROSS_ROOT}/tools/bin/${GNU_CROSS_TARGET}-ar
+#CONFIGURE_ARGS+=	--set=target.${TARGET}.ar=${CROSS_ROOT}/tools/bin/${GNU_CROSS_TARGET}-ar
 #CONFIGURE_ARGS+=	--set=target.${TARGET}.ar=${SCRIPTS}/ar-wrap
 
 # May be required when cross-building on NetBSD
diff --git a/rust185/do-cross.mk b/rust185/do-cross.mk
index 03c651fe3b..36d5cd1a7f 100644
--- a/rust185/do-cross.mk
+++ b/rust185/do-cross.mk
@@ -5,14 +5,14 @@
 VERSION!=	make show-var VARNAME=PKGVERSION
 V_NOREV!=	make show-var VARNAME=PKGVERSION_NOREV
 
-#SHORT_TARGETS+=		armv7
-#SHORT_TARGETS+=		armv6
-#SHORT_TARGETS+=		sparc64
-#SHORT_TARGETS+=		powerpc
-#SHORT_TARGETS+=		arm64
-#SHORT_TARGETS+=		arm64_be
-#SHORT_TARGETS+=		i386
-#SHORT_TARGETS+=		riscv64
+SHORT_TARGETS+=		armv7
+SHORT_TARGETS+=		armv6
+SHORT_TARGETS+=		sparc64
+SHORT_TARGETS+=		powerpc
+SHORT_TARGETS+=		arm64
+SHORT_TARGETS+=		arm64_be
+SHORT_TARGETS+=		i386
+SHORT_TARGETS+=		riscv64
 SHORT_TARGETS+=		mipsel	# produces mips32 (not mips1) executables
 
 # Conditional local overrides of ROOT.* variables:


Home | Main Index | Thread Index | Old Index