rust179: reduce diff to lang/rust

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: rust179: reduce diff to lang/rust
From: Thomas Klausner <wiz%NetBSD.org@localhost>
Date: Sun, 7 Jul 2024 12:31:43 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sun Jul 7 14:31:32 2024 +0200
Changeset:	cd6bf04bc39f497188623e347f56cf6f98b11d6b

Modified Files:
	rust179/buildlink3.mk
	rust179/cargo.mk
	rust179/cross.mk
	rust179/distinfo
	rust179/do-cross.mk
	rust179/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
	rust179/patches/patch-compiler_rustc__llvm_build.rs
	rust179/patches/patch-compiler_rustc__target_src_spec_mod.rs
	rust179/patches/patch-library_backtrace_src_symbolize_gimli.rs
	rust179/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs
	rust179/patches/patch-src_bootstrap_bootstrap.py
	rust179/patches/patch-src_bootstrap_src_core_build__steps_compile.rs
	rust179/patches/patch-src_bootstrap_src_core_builder.rs
	rust179/patches/patch-src_bootstrap_src_lib.rs
	rust179/patches/patch-src_llvm-project_llvm_CMakeLists.txt
	rust179/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
	rust179/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h
	rust179/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
	rust179/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
	rust179/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
	rust179/patches/patch-src_tools_cargo_tests_testsuite_build.rs
	rust179/patches/patch-src_tools_rust-installer_install-template.sh
	rust179/patches/patch-vendor_cc-1.0.73_src_lib.rs
	rust179/patches/patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
	rust179/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
	rust179/platform.mk
	rust179/rust.mk

Log Message:
rust179: reduce diff 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=cd6bf04bc39f497188623e347f56cf6f98b11d6b

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

diffstat:
 rust179/buildlink3.mk                                          |  2 +-
 rust179/cargo.mk                                               |  2 +-
 rust179/cross.mk                                               |  2 +-
 rust179/distinfo                                               |  4 ++--
 rust179/do-cross.mk                                            | 10 +++++-----
 .../patch-compiler_rustc__codegen__ssa_src_back_linker.rs      |  6 +++---
 rust179/patches/patch-compiler_rustc__llvm_build.rs            |  2 +-
 rust179/patches/patch-compiler_rustc__target_src_spec_mod.rs   |  2 +-
 rust179/patches/patch-library_backtrace_src_symbolize_gimli.rs |  2 +-
 .../patches/patch-library_backtrace_src_symbolize_gimli_elf.rs |  2 +-
 rust179/patches/patch-src_bootstrap_bootstrap.py               |  2 +-
 .../patch-src_bootstrap_src_core_build__steps_compile.rs       |  2 +-
 rust179/patches/patch-src_bootstrap_src_core_builder.rs        |  4 ++--
 rust179/patches/patch-src_bootstrap_src_lib.rs                 |  2 +-
 rust179/patches/patch-src_llvm-project_llvm_CMakeLists.txt     |  2 +-
 .../patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake    |  2 +-
 .../patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h     |  2 +-
 ...c_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h |  2 +-
 .../patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp  |  2 +-
 .../patches/patch-src_tools_cargo_src_cargo_core_profiles.rs   |  2 +-
 rust179/patches/patch-src_tools_cargo_tests_testsuite_build.rs |  2 +-
 .../patches/patch-src_tools_rust-installer_install-template.sh |  2 +-
 rust179/patches/patch-vendor_cc-1.0.73_src_lib.rs              |  2 +-
 ...ndor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_riscv64.rs |  2 +-
 ...c-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs |  2 +-
 rust179/platform.mk                                            |  7 ++++++-
 rust179/rust.mk                                                |  7 ++++---
 27 files changed, 43 insertions(+), 37 deletions(-)

diffs:
diff --git a/rust179/buildlink3.mk b/rust179/buildlink3.mk
index 1e4c6a9c9d..b8eeb79834 100644
--- a/rust179/buildlink3.mk
+++ b/rust179/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2020/07/08 14:46:14 jperkin Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2023/10/25 05:50:43 pin Exp $
 
 BUILDLINK_TREE+=	rust
 
diff --git a/rust179/cargo.mk b/rust179/cargo.mk
index 1181957f5b..2b75450d19 100644
--- a/rust179/cargo.mk
+++ b/rust179/cargo.mk
@@ -1,4 +1,4 @@
-# $NetBSD: cargo.mk,v 1.35 2023/05/16 06:10:52 wiz Exp $
+# $NetBSD: cargo.mk,v 1.37 2024/05/04 20:06:55 tnn Exp $
 #
 # Common logic that can be used by packages that depend on cargo crates
 # from crates.io. This lets existing pkgsrc infrastructure fetch and verify
diff --git a/rust179/cross.mk b/rust179/cross.mk
index 2984a3d058..3116278f44 100644
--- a/rust179/cross.mk
+++ b/rust179/cross.mk
@@ -1,4 +1,4 @@
-# $NetBSD: cross.mk,v 1.3 2020/07/16 09:35:37 jperkin Exp $
+# $NetBSD: cross.mk,v 1.11 2023/07/10 12:01:24 he Exp $
 
 # These settings may be used to cross-build rust.
 #
diff --git a/rust179/distinfo b/rust179/distinfo
index 4573b2f577..39f41d1afe 100644
--- a/rust179/distinfo
+++ b/rust179/distinfo
@@ -108,7 +108,7 @@ Size (rust-std-1.78.0-x86_64-unknown-netbsd.tar.xz) = 23245376 bytes
 BLAKE2s (rustc-1.79.0-src.tar.gz) = 0d2faf6d2455275a09c78a0f8e3e1bfa5d864b5dfc70980f7ee42c188422f4fc
 SHA512 (rustc-1.79.0-src.tar.gz) = 4fa7385b2e89816849f1c353be3bf8fd36c05896ca7ded53dedfb92876ab2f40b77235a9eaa84ab34c045ddcd3a5c67644a986b9cc8695e5f824d22416bcd018
 Size (rustc-1.79.0-src.tar.gz) = 297469050 bytes
-SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = 6c8f8bbacc544b63b20a9546ffe8ca5d74b6f4d4
+SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = 3105b0c89cf04b4469fc56cd89e7e4a661517002
 SHA1 (patch-compiler_rustc__llvm_build.rs) = a4a66d449fc9eb99d648d02a041778a68f4f7ce8
 SHA1 (patch-compiler_rustc__target_src_spec_base_netbsd.rs) = 7d910631f49acf2c33fdd191fd3e0f261efae234
 SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = a22b5d28997ed9a5565deec9c34322165d563d00
@@ -120,7 +120,7 @@ SHA1 (patch-library_std_src_sys_pal_unix_thread__parking_netbsd.rs) = 9b073ba37a
 SHA1 (patch-src_bootstrap_bootstrap.py) = 5cd73003292c935ce0e405edd132180233a04857
 SHA1 (patch-src_bootstrap_src_core_build__steps_compile.rs) = 4696304623232acd419ad15597f539a10a014271
 SHA1 (patch-src_bootstrap_src_core_build__steps_install.rs) = cc6558df42c9c9ac28fdb2ff180bdaa7f22ce816
-SHA1 (patch-src_bootstrap_src_core_builder.rs) = 57bf8e00ea863e5908f46e10bb208d7bc0b5d031
+SHA1 (patch-src_bootstrap_src_core_builder.rs) = bb9f428bf4da9bf11a19de69f308ef4d9b5a7002
 SHA1 (patch-src_bootstrap_src_lib.rs) = d29bc3c0b335d5e788eecbb02fc08966beef0fb1
 SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 7abfabb6ec70df229a69355f8c76825610165c37
 SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = e1b2eb2f0b3cf1cf87b443656ae306b3242f6b12
diff --git a/rust179/do-cross.mk b/rust179/do-cross.mk
index 2c8bbec90d..90a25174ac 100644
--- a/rust179/do-cross.mk
+++ b/rust179/do-cross.mk
@@ -10,10 +10,10 @@ SHORT_TARGETS+=		armv6
 SHORT_TARGETS+=		sparc64
 SHORT_TARGETS+=		powerpc
 SHORT_TARGETS+=		arm64
-#SHORT_TARGETS+=		arm64_be
+#SHORT_TARGETS+=	arm64_be
 SHORT_TARGETS+=		i386
 SHORT_TARGETS+=		riscv64
-#SHORT_TARGETS+=		mipsel	# produces mips32 (not mips1) executables
+#SHORT_TARGETS+=	mipsel	# produces mips32 (not mips1) executables
 
 # Conditional local overrides of ROOT.* variables:
 .sinclude "local-roots.mk"
@@ -77,7 +77,7 @@ CA.${st}+=--set=target.${TGT.${st}}.linker=${SCRIPTS}/gcc-wrap
 CA.${st}+=--set=target.${TGT.${st}}.ar=${ROOT.${st}}/tools/bin/${G_TGT.${st}}-ar
 do-${st}:
 	mkdir -p dist
-	@echo "=======> Cross-building rust for ${st}"
+	@${ECHO} "=======> Cross-building rust for ${st}"
 	${DEBUG} make -f Makefile clean
 	${DEBUG} env \
 		CROSS_ROOT=${ROOT.${st}} \
@@ -95,13 +95,13 @@ do-${st}:
 		src=$${distdir}/$${comp}-${V_NOREV}-${TGT.${st}}.tar.xz; \
 		tgt=dist/$${comp}-${VERSION}-$${TT}.tar.xz; \
 		if [ ! -f "$${tgt}" ]; then \
-			echo ln $${src} $${tgt}; \
+			${ECHO} ln $${src} $${tgt}; \
 			${DEBUG} ln $${src} $${tgt}; \
 		fi; \
 	done; \
 	src_comp=rust-src-${V_NOREV}.tar.xz; \
 	if [ ! -f dist/$${src_comp} ]; then \
-		echo ln $${distdir}/$${src_comp} dist; \
+		${ECHO} ln $${distdir}/$${src_comp} dist; \
 		${DEBUG} ln $${distdir}/$${src_comp} dist; \
 	fi
 .endfor
diff --git a/rust179/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs b/rust179/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
index 21e000a69a..911bedebe3 100644
--- a/rust179/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
+++ b/rust179/patches/patch-compiler_rustc__codegen__ssa_src_back_linker.rs
@@ -1,10 +1,10 @@
-$NetBSD$
+$NetBSD: patch-compiler_rustc__codegen__ssa_src_back_linker.rs,v 1.15 2024/04/18 09:29:42 pin Exp $
 
 Do not use @rpath on Darwin.
 
---- compiler/rustc_codegen_ssa/src/back/linker.rs.orig	2022-12-12 16:02:12.000000000 +0000
+--- compiler/rustc_codegen_ssa/src/back/linker.rs.orig	2006-07-24 01:21:28.000000000 +0000
 +++ compiler/rustc_codegen_ssa/src/back/linker.rs
-@@ -318,7 +318,7 @@ impl<'a> GccLinker<'a> {
+@@ -312,7 +312,7 @@ impl<'a> GccLinker<'a> {
              // principled solution at some point to force the compiler to pass
              // the right `-Wl,-install_name` with an `@rpath` in it.
              if self.sess.opts.cg.rpath || self.sess.opts.unstable_opts.osx_rpath_install_name {
diff --git a/rust179/patches/patch-compiler_rustc__llvm_build.rs b/rust179/patches/patch-compiler_rustc__llvm_build.rs
index b000456d6d..4edd1eebea 100644
--- a/rust179/patches/patch-compiler_rustc__llvm_build.rs
+++ b/rust179/patches/patch-compiler_rustc__llvm_build.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-compiler_rustc__llvm_build.rs,v 1.17 2024/04/18 09:29:42 pin Exp $
 
 Fix build on NetBSD HEAD-llvm. XXX there is probably a better way to do this.
 
diff --git a/rust179/patches/patch-compiler_rustc__target_src_spec_mod.rs b/rust179/patches/patch-compiler_rustc__target_src_spec_mod.rs
index 324f6c804d..48bba380a5 100644
--- a/rust179/patches/patch-compiler_rustc__target_src_spec_mod.rs
+++ b/rust179/patches/patch-compiler_rustc__target_src_spec_mod.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-compiler_rustc__target_src_spec_mod.rs,v 1.17 2024/04/18 09:29:42 pin Exp $
 
 Add entry for NetBSD/mips64el.
 
diff --git a/rust179/patches/patch-library_backtrace_src_symbolize_gimli.rs b/rust179/patches/patch-library_backtrace_src_symbolize_gimli.rs
index 0ed9af7822..383821313d 100644
--- a/rust179/patches/patch-library_backtrace_src_symbolize_gimli.rs
+++ b/rust179/patches/patch-library_backtrace_src_symbolize_gimli.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-library_backtrace_src_symbolize_gimli.rs,v 1.6 2024/04/18 09:29:42 pin Exp $
 
 Add NetBSD to the family who is in the unix class.
 
diff --git a/rust179/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs b/rust179/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs
index c8ee922920..a262257884 100644
--- a/rust179/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs
+++ b/rust179/patches/patch-library_backtrace_src_symbolize_gimli_elf.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-library_backtrace_src_symbolize_gimli_elf.rs,v 1.8 2024/04/18 09:29:42 pin Exp $
 
 Make NetBSD also find its debug libraries, if present.
 
diff --git a/rust179/patches/patch-src_bootstrap_bootstrap.py b/rust179/patches/patch-src_bootstrap_bootstrap.py
index 20489b8ae1..b4d69452da 100644
--- a/rust179/patches/patch-src_bootstrap_bootstrap.py
+++ b/rust179/patches/patch-src_bootstrap_bootstrap.py
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_bootstrap_bootstrap.py,v 1.4 2020/02/17 20:24:18 jperkin Exp $
+$NetBSD: patch-src_bootstrap_bootstrap.py,v 1.23 2024/04/18 09:29:42 pin Exp $
 
 Use `uname -p` on NetBSD, as that is reliable and sensible there.
 Handle earmv[67]hf for NetBSD.
diff --git a/rust179/patches/patch-src_bootstrap_src_core_build__steps_compile.rs b/rust179/patches/patch-src_bootstrap_src_core_build__steps_compile.rs
index a14e2a2bd8..485349b7ec 100644
--- a/rust179/patches/patch-src_bootstrap_src_core_build__steps_compile.rs
+++ b/rust179/patches/patch-src_bootstrap_src_core_build__steps_compile.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-src_bootstrap_src_core_build__steps_compile.rs,v 1.2 2024/04/18 09:29:42 pin Exp $
 
 On Darwin, do not use @rpath for internal libraries.
 
diff --git a/rust179/patches/patch-src_bootstrap_src_core_builder.rs b/rust179/patches/patch-src_bootstrap_src_core_builder.rs
index f96f1e470c..1dd07ff2e7 100644
--- a/rust179/patches/patch-src_bootstrap_src_core_builder.rs
+++ b/rust179/patches/patch-src_bootstrap_src_core_builder.rs
@@ -2,9 +2,9 @@ $NetBSD$
 
 Use @PREFIX@, not $ORIGIN in rpath.
 
---- src/bootstrap/src/core/builder.rs.orig	2024-02-04 13:18:05.000000000 +0000
+--- src/bootstrap/src/core/builder.rs.orig	2024-07-07 12:16:58.347642901 +0000
 +++ src/bootstrap/src/core/builder.rs
-@@ -2416,7 +2416,7 @@ impl Cargo {
+@@ -2513,7 +2518,7 @@ impl Cargo {
                  Some(format!("-Wl,-rpath,@loader_path/../{libdir}"))
              } else if !target.is_windows() && !target.contains("aix") && !target.contains("xous") {
                  self.rustflags.arg("-Clink-args=-Wl,-z,origin");
diff --git a/rust179/patches/patch-src_bootstrap_src_lib.rs b/rust179/patches/patch-src_bootstrap_src_lib.rs
index 6eae1d06df..d3d2e25ffb 100644
--- a/rust179/patches/patch-src_bootstrap_src_lib.rs
+++ b/rust179/patches/patch-src_bootstrap_src_lib.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-src_bootstrap_src_lib.rs,v 1.2 2024/04/18 09:29:42 pin Exp $
 
 Don't filter out optimization flags.
 FreeBSD has a particular C++ runtime library name
diff --git a/rust179/patches/patch-src_llvm-project_llvm_CMakeLists.txt b/rust179/patches/patch-src_llvm-project_llvm_CMakeLists.txt
index 2477a555c8..d0dfe4e6da 100644
--- a/rust179/patches/patch-src_llvm-project_llvm_CMakeLists.txt
+++ b/rust179/patches/patch-src_llvm-project_llvm_CMakeLists.txt
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_llvm-project_llvm_CMakeLists.txt,v 1.1 2019/04/14 12:42:03 he Exp $
+$NetBSD: patch-src_llvm-project_llvm_CMakeLists.txt,v 1.14 2024/04/18 09:29:42 pin Exp $
 
 Don't implement sys/regset.h workaround, fix source instead.
 
diff --git a/rust179/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake b/rust179/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
index b213c40364..6a701cd3aa 100644
--- a/rust179/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
+++ b/rust179/patches/patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake,v 1.3 2020/08/06 11:42:56 jperkin Exp $
+$NetBSD: patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake,v 1.15 2024/04/18 09:29:42 pin Exp $
 
 On Darwin, use correct install-name for shared libraries.
 
diff --git a/rust179/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h b/rust179/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h
index 7250a1f149..8722fdfe38 100644
--- a/rust179/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h
+++ b/rust179/patches/patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h,v 1.1 2019/04/14 12:42:03 he Exp $
+$NetBSD: patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h,v 1.8 2024/04/18 09:29:42 pin Exp $
 
 Don't implement sys/regset.h workaround, fix source instead.
 
diff --git a/rust179/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h b/rust179/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
index 37d491478d..159d4a70de 100644
--- a/rust179/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
+++ b/rust179/patches/patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h,v 1.1 2019/04/14 12:42:03 he Exp $
+$NetBSD: patch-src_llvm-project_llvm_include_llvm_Analysis_ConstantFolding.h,v 1.10 2024/04/18 09:29:42 pin Exp $
 
 Fix SunOS CS conflict not handled by include/llvm-c/DataTypes.h
 
diff --git a/rust179/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp b/rust179/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
index 02c93ff2ec..e255aa5af9 100644
--- a/rust179/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
+++ b/rust179/patches/patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp,v 1.2 2019/10/02 12:51:43 he Exp $
+$NetBSD: patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp,v 1.13 2024/04/18 09:29:42 pin Exp $
 
 Avoid ambiguous function call.
 
diff --git a/rust179/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs b/rust179/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
index ac9ad7239c..0d2e97d952 100644
--- a/rust179/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
+++ b/rust179/patches/patch-src_tools_cargo_src_cargo_core_profiles.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_tools_cargo_src_cargo_core_profiles.rs,v 1.3 2019/03/07 20:19:11 jperkin Exp $
+$NetBSD: patch-src_tools_cargo_src_cargo_core_profiles.rs,v 1.17 2024/04/18 09:29:42 pin Exp $
 
 Turn off incremental builds for sparc64, ref.
 https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_incremental_build.patch/
diff --git a/rust179/patches/patch-src_tools_cargo_tests_testsuite_build.rs b/rust179/patches/patch-src_tools_cargo_tests_testsuite_build.rs
index 7ffba0f965..9eab28030c 100644
--- a/rust179/patches/patch-src_tools_cargo_tests_testsuite_build.rs
+++ b/rust179/patches/patch-src_tools_cargo_tests_testsuite_build.rs
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_tools_cargo_tests_testsuite_build.rs,v 1.5 2019/08/29 14:09:57 he Exp $
+$NetBSD: patch-src_tools_cargo_tests_testsuite_build.rs,v 1.14 2024/04/18 09:29:42 pin Exp $
 
 Don't attempt incremental operations on sparc64, ref.
 https://sources.debian.org/patches/cargo/0.29.0-1/2007_sparc64_disable_incremental_build.patch/
diff --git a/rust179/patches/patch-src_tools_rust-installer_install-template.sh b/rust179/patches/patch-src_tools_rust-installer_install-template.sh
index d4036445de..556cade057 100644
--- a/rust179/patches/patch-src_tools_rust-installer_install-template.sh
+++ b/rust179/patches/patch-src_tools_rust-installer_install-template.sh
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_tools_rust-installer_install-template.sh,v 1.5 2021/06/09 13:42:30 adam Exp $
+$NetBSD: patch-src_tools_rust-installer_install-template.sh,v 1.14 2024/04/18 09:29:42 pin Exp $
 
 No logging to 'install.log'.
 Do not create 'uninstall.sh'.
diff --git a/rust179/patches/patch-vendor_cc-1.0.73_src_lib.rs b/rust179/patches/patch-vendor_cc-1.0.73_src_lib.rs
index 864beacf10..9282a0778e 100644
--- a/rust179/patches/patch-vendor_cc-1.0.73_src_lib.rs
+++ b/rust179/patches/patch-vendor_cc-1.0.73_src_lib.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_cc-1.0.73_src_lib.rs,v 1.4 2024/04/18 09:29:42 pin Exp $
 
 Use correct ABI on NetBSD/riscv64.
 
diff --git a/rust179/patches/patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_riscv64.rs b/rust179/patches/patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
index 17b7d39991..cc352ff279 100644
--- a/rust179/patches/patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
+++ b/rust179/patches/patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_riscv64.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_libc-0.2.148_src_unix_bsd_netbsdlike_netbsd_riscv64.rs,v 1.2 2024/04/18 09:29:42 pin Exp $
 
 Add support for NetBSD/riscv64.
 
diff --git a/rust179/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs b/rust179/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
index 98a1d9cb7b..6c90dec84c 100644
--- a/rust179/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
+++ b/rust179/patches/patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-vendor_rustc-ap-rustc__target_src_spec_aarch64__be__unknown__netbsd.rs,v 1.9 2024/04/18 09:29:43 pin Exp $
 
 Add aarch64_be NetBSD target.
 
diff --git a/rust179/platform.mk b/rust179/platform.mk
index cc75fd55ab..d1e2655b04 100644
--- a/rust179/platform.mk
+++ b/rust179/platform.mk
@@ -1,4 +1,4 @@
-# $NetBSD: platform.mk,v 1.6 2020/12/26 10:04:51 nia Exp $
+# $NetBSD: platform.mk,v 1.24 2024/07/07 11:00:37 wiz Exp $
 
 # This file encodes whether a given platform has support for rust.
 
@@ -16,6 +16,11 @@ RUST_PLATFORMS+=	${rust_os}-*-${rust_arch}
 .  endfor
 .endfor
 
+.if ${OPSYS} == "NetBSD" && (${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "earmv7hf")
+RUST_DIR?=	../../lang/rust176
+.endif
+RUST_DIR?=	../../lang/rust
+
 .for rust_platform in ${RUST_PLATFORMS}
 .  if !empty(MACHINE_PLATFORM:M${rust_platform})
 PLATFORM_SUPPORTS_RUST=		yes
diff --git a/rust179/rust.mk b/rust179/rust.mk
index d930124865..2a29bc959e 100644
--- a/rust179/rust.mk
+++ b/rust179/rust.mk
@@ -1,4 +1,4 @@
-# $NetBSD: rust.mk,v 1.7 2020/10/14 08:23:49 triaxx Exp $
+# $NetBSD: rust.mk,v 1.9 2024/07/07 11:00:37 wiz Exp $
 #
 # This file determines the type of rust package to use.
 #
@@ -32,6 +32,7 @@
 #	Default: no
 
 .include "../../mk/bsd.fast.prefs.mk"
+.include "platform.mk"
 
 RUST_REQ?=	1.56.1
 RUST_RUNTIME?=	no
@@ -43,7 +44,7 @@ RUST_TYPE?=	src
 BUILDLINK_DEPMETHOD.rust-bin?=		build
 .  endif
 BUILDLINK_API_DEPENDS.rust-bin+=	rust-bin>=${RUST_REQ}
-.  include "../../lang/rust-bin/buildlink3.mk"
+.  include "${RUST_DIR}-bin/buildlink3.mk"
 .endif
 
 .if ${RUST_TYPE} == "src"
@@ -51,5 +52,5 @@ BUILDLINK_API_DEPENDS.rust-bin+=	rust-bin>=${RUST_REQ}
 BUILDLINK_DEPMETHOD.rust?=		build
 .  endif
 BUILDLINK_API_DEPENDS.rust+=		rust>=${RUST_REQ}
-.  include "../../lang/rust/buildlink3.mk"
+.  include "${RUST_DIR}/buildlink3.mk"
 .endif
Prev by Date: cool-retro-term: Use GITHUB_SUBMODULES as suggested by Thomas Klausner
Next by Date: iosevka-*: update to 30.3.2
Previous by Thread: cool-retro-term: Use GITHUB_SUBMODULES as suggested by Thomas Klausner
Next by Thread: rust179: reduce diff to lang/rust
Indexes:
Home | Main Index | Thread Index | Old Index