rust183: Fix make test.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: rust183: Fix make test.
From: Jonathan Perkin (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Tue, 4 Feb 2025 17:11:20 +0000
Module Name:	pkgsrc-wip
Committed By:	Jonathan Perkin <jperkin%smartos.org@localhost>
Pushed By:	jperkin
Date:		Tue Feb 4 17:10:39 2025 +0000
Changeset:	4f4be3b32344bc38e532e329fcae1a7c876e2476

Modified Files:
	rust183/Makefile
	rust183/distinfo
	rust183/patches/patch-compiler_rustc__llvm_build.rs
	rust183/patches/patch-src_bootstrap_bootstrap.py
	rust183/patches/patch-src_bootstrap_src_core_builder.rs
	rust183/patches/patch-src_bootstrap_src_lib.rs
	rust183/patches/patch-vendor_bytecount-0.6.8_src_lib.rs
Added Files:
	rust183/patches/patch-tests_assembly_targets_targets-elf.rs

Log Message:
rust183: Fix make test.

Patch files must not contain trailing whitespace or tabs otherwise the
'tidy' test will break before the main test suite can run.

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

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

diffstat:
 rust183/Makefile                                         |  2 +-
 rust183/distinfo                                         | 11 ++++++-----
 rust183/patches/patch-compiler_rustc__llvm_build.rs      | 14 +++++++-------
 rust183/patches/patch-src_bootstrap_bootstrap.py         |  2 +-
 rust183/patches/patch-src_bootstrap_src_core_builder.rs  |  4 ++--
 rust183/patches/patch-src_bootstrap_src_lib.rs           |  2 +-
 .../patches/patch-tests_assembly_targets_targets-elf.rs  | 16 ++++++++++++++++
 rust183/patches/patch-vendor_bytecount-0.6.8_src_lib.rs  |  2 +-
 8 files changed, 35 insertions(+), 18 deletions(-)

diffs:
diff --git a/rust183/Makefile b/rust183/Makefile
index 67fcde72e4..742c28a259 100644
--- a/rust183/Makefile
+++ b/rust183/Makefile
@@ -463,7 +463,7 @@ CKSUMS+=	27f9bff08b24828e1a611b10a0282f5457d12e9e7254202040144d392297d720
 
 CKSUM_CRATES+=	vendor/bytecount-0.6.8
 CKSUMS+=	01cd755a128d8a5892f3edda195b26bb461be375be17dd72e6e4f061169e6dff
-CKSUMS+=	a6750c0e2a6c385ec902cd7f87de7835fe2b4171b9c83da64122274ee20a77c6
+CKSUMS+=	7c6609685c161ac6b2c667f59bd6476c5c14c7269ec949fb2def5a0238198c25
 
 SUBST_CLASSES+=		cksum
 SUBST_STAGE.cksum=	pre-configure
diff --git a/rust183/distinfo b/rust183/distinfo
index b74fbbb02e..71dc6ed346 100644
--- a/rust183/distinfo
+++ b/rust183/distinfo
@@ -109,7 +109,7 @@ BLAKE2s (rustc-1.83.0-src.tar.gz) = 52620e2b07df550604ff94a232230795e561ba90f22e
 SHA512 (rustc-1.83.0-src.tar.gz) = 84e5494e4e51a3c885a3155ef3b619923f9ad69bb4196dde6b2e1b11f0d2ef6328a019d1a81a1cb39325730ee1c506c8257936cecc93af1b3d3422838bdc029f
 Size (rustc-1.83.0-src.tar.gz) = 727622101 bytes
 SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = f2af6e3b4925e8ca21b7cd783f7831b72700384a
-SHA1 (patch-compiler_rustc__llvm_build.rs) = a4a66d449fc9eb99d648d02a041778a68f4f7ce8
+SHA1 (patch-compiler_rustc__llvm_build.rs) = 3acef995e3038a98b29b31b9bdd43286b1ac29f7
 SHA1 (patch-compiler_rustc__target_src_spec_base_netbsd.rs) = f6805317abaf61fa5e713af0b3599945a93a751a
 SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = a22b5d28997ed9a5565deec9c34322165d563d00
 SHA1 (patch-compiler_rustc__target_src_spec_targets_aarch64__be__unknown__netbsd.rs) = 620eaf74c1dd030973af53dfe4f9aa998be5b123
@@ -121,11 +121,11 @@ SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 9d5ef634c5a454e474ea5fee
 SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 3b84a462c6bc8245d579452e4c37e3ce13314952
 SHA1 (patch-library_std_src_sys_pal_unix_mod.rs) = bfc59ae4568547e3ed71c8b31ba5b5b5363d5d40
 SHA1 (patch-library_stdarch_crates_std__detect_tests_cpu-detection.rs) = 97c3ad8ea39c25d41256fcad80fae1e6e4970124
-SHA1 (patch-src_bootstrap_bootstrap.py) = 150a5a7e057de9edbf96f3c387207fda8ba750f9
+SHA1 (patch-src_bootstrap_bootstrap.py) = 590308748215f7fa386a87aa185f1f5d2dc39323
 SHA1 (patch-src_bootstrap_src_core_build__steps_compile.rs) = e928203ed4734c93cc33c5a3f7879cf18dcecc83
 SHA1 (patch-src_bootstrap_src_core_build__steps_install.rs) = cc6558df42c9c9ac28fdb2ff180bdaa7f22ce816
-SHA1 (patch-src_bootstrap_src_core_builder.rs) = 55cb8cc21ed5d4c7b297752238d0ee3cf7eb3494
-SHA1 (patch-src_bootstrap_src_lib.rs) = d29bc3c0b335d5e788eecbb02fc08966beef0fb1
+SHA1 (patch-src_bootstrap_src_core_builder.rs) = 0ff7487718a04080adf6a9631ee2069ace6c3928
+SHA1 (patch-src_bootstrap_src_lib.rs) = 331f14cee4b89d306122c61a68dfc356c872f4f3
 SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 7abfabb6ec70df229a69355f8c76825610165c37
 SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = e1b2eb2f0b3cf1cf87b443656ae306b3242f6b12
 SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = cb011fc19957883c01725797f7c85ed1b20f96f1
@@ -134,8 +134,9 @@ SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 2587c2f4d11ad
 SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = e1af7fde97416e0a269ee34efd37f4f47fcf7a95
 SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = a7d49360e4c4a082bf640b7d79e3694580d340e4
 SHA1 (patch-src_tools_rust-installer_install-template.sh) = 6984546c34a2e4d55a6dbe59baa0d4958184e0b7
+SHA1 (patch-tests_assembly_targets_targets-elf.rs) = 4a3b9ac02905063f56c59a811509d793ec445c85
 SHA1 (patch-tools_rust-analyzer_lib_line-index-src_lib.rs) = 4ed527174447ee23fa81dd6840e18b9949d5a273
-SHA1 (patch-vendor_bytecount-0.6.8_src_lib.rs) = d7610f2ae957d085a465f8c75549e5a11586a8b0
+SHA1 (patch-vendor_bytecount-0.6.8_src_lib.rs) = df3641afebac2b06dc9d266524e295c461c441d4
 SHA1 (patch-vendor_crossbeam-utils-0.8.18_no__atomic.rs) = d4d9288cb199af9bc7e321fbd2b42860aed954ec
 SHA1 (patch-vendor_libc-0.2.155_src_unix_solarish_mod.rs) = 97505b88875aa80fa2b5589b6090237c3786e143
 SHA1 (patch-vendor_memchr-2.7.4_src_arch_aarch64_memchr.rs) = 3e17e9f068afe5e812d10bf57fd3f6d4c21baf0b
diff --git a/rust183/patches/patch-compiler_rustc__llvm_build.rs b/rust183/patches/patch-compiler_rustc__llvm_build.rs
index 4edd1eebea..74346dbe8e 100644
--- a/rust183/patches/patch-compiler_rustc__llvm_build.rs
+++ b/rust183/patches/patch-compiler_rustc__llvm_build.rs
@@ -25,9 +25,9 @@ https://github.com/rust-lang/rust/pull/104572
          // However, LLVM insists on using 64-bit atomics.
          // This gives rise to a need to link rust itself with -latomic for these targets
 -        if target.starts_with("i586") || target.starts_with("i686") {
-+        if target.starts_with("i386") 
-+           || target.starts_with("i486") 
-+           || target.starts_with("i586") 
++        if target.starts_with("i386")
++           || target.starts_with("i486")
++           || target.starts_with("i586")
 +           || target.starts_with("i686")
 +        {
              println!("cargo:rustc-link-lib=atomic");
@@ -38,13 +38,13 @@ https://github.com/rust-lang/rust/pull/104572
      } else if target.contains("netbsd") && llvm_static_stdcpp.is_some() {
          // NetBSD uses a separate library when relocation is required
 -        "stdc++_p"
-+	if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() {
++        if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() {
 +            "c++_pic"
-+	} else {
++        } else {
 +            "stdc++_pic"
-+	}
++        }
 +    } else if env::var_os("PKGSRC_HAVE_LIBCPP").is_some() {
-+	"c++"
++        "c++"
      } else if llvm_use_libcxx.is_some() {
          "c++"
      } else {
diff --git a/rust183/patches/patch-src_bootstrap_bootstrap.py b/rust183/patches/patch-src_bootstrap_bootstrap.py
index badc6a4583..3a4f4fa1bb 100644
--- a/rust183/patches/patch-src_bootstrap_bootstrap.py
+++ b/rust183/patches/patch-src_bootstrap_bootstrap.py
@@ -59,7 +59,7 @@ Also use @PREFIX@ and not $ORIGIN in rpath.
  
          patchelf = "{}/bin/patchelf".format(nix_deps_dir)
          rpath_entries = [
-+	    "@PREFIX@/lib",
++            "@PREFIX@/lib",
              os.path.join(os.path.realpath(nix_deps_dir), "lib")
          ]
          patchelf_args = ["--add-rpath", ":".join(rpath_entries)]
diff --git a/rust183/patches/patch-src_bootstrap_src_core_builder.rs b/rust183/patches/patch-src_bootstrap_src_core_builder.rs
index 6fc7191af6..05340fec7d 100644
--- a/rust183/patches/patch-src_bootstrap_src_core_builder.rs
+++ b/rust183/patches/patch-src_bootstrap_src_core_builder.rs
@@ -34,8 +34,8 @@ which should fix the cross-compile failure.
              rustdocflags.arg("--cfg=parallel_compiler");
          }
  
-+	// added for pkgsrc libunwind and LLVM
-+	rustflags.arg("-Clink-args=-Wl,-rpath,@PREFIX@/lib,-L@PREFIX@/lib");
++        // added for pkgsrc libunwind and LLVM
++        rustflags.arg("-Clink-args=-Wl,-rpath,@PREFIX@/lib,-L@PREFIX@/lib");
 +
          Cargo {
              command: cargo,
diff --git a/rust183/patches/patch-src_bootstrap_src_lib.rs b/rust183/patches/patch-src_bootstrap_src_lib.rs
index d3d2e25ffb..e7ca14bda1 100644
--- a/rust183/patches/patch-src_bootstrap_src_lib.rs
+++ b/rust183/patches/patch-src_bootstrap_src_lib.rs
@@ -16,7 +16,7 @@ FreeBSD has a particular C++ runtime library name
          // we want libc++ (more filled out than libstdc++), ensuring that
          // LLVM/etc are all properly compiled.
 -        if matches!(c, CLang::Cxx) && target.contains("apple-darwin") {
-+        if matches!(c, CLang::Cxx) && 
++        if matches!(c, CLang::Cxx) &&
 +            (target.contains("apple-darwin") || target.contains("freebsd")) {
              base.push("-stdlib=libc++".into());
          }
diff --git a/rust183/patches/patch-tests_assembly_targets_targets-elf.rs b/rust183/patches/patch-tests_assembly_targets_targets-elf.rs
new file mode 100644
index 0000000000..cce5f2b508
--- /dev/null
+++ b/rust183/patches/patch-tests_assembly_targets_targets-elf.rs
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Fix make test.
+
+--- tests/assembly/targets/targets-elf.rs.orig	2025-02-04 13:15:03.384854786 +0000
++++ tests/assembly/targets/targets-elf.rs
+@@ -276,6 +276,9 @@
+ //@ revisions: mips64el_unknown_linux_muslabi64
+ //@ [mips64el_unknown_linux_muslabi64] compile-flags: --target mips64el-unknown-linux-muslabi64
+ //@ [mips64el_unknown_linux_muslabi64] needs-llvm-components: mips
++//@ revisions: mips64el_unknown_netbsd
++//@ [mips64el_unknown_netbsd] compile-flags: --target mips64el_unknown_netbsd-unknown-linux-muslabi64
++//@ [mips64el_unknown_netbsd] needs-llvm-components: mips
+ //@ revisions: mips_unknown_linux_gnu
+ //@ [mips_unknown_linux_gnu] compile-flags: --target mips-unknown-linux-gnu
+ //@ [mips_unknown_linux_gnu] needs-llvm-components: mips
diff --git a/rust183/patches/patch-vendor_bytecount-0.6.8_src_lib.rs b/rust183/patches/patch-vendor_bytecount-0.6.8_src_lib.rs
index 8726eb0b2e..d587a1a864 100644
--- a/rust183/patches/patch-vendor_bytecount-0.6.8_src_lib.rs
+++ b/rust183/patches/patch-vendor_bytecount-0.6.8_src_lib.rs
@@ -23,7 +23,7 @@ Ref. https://github.com/rust-lang/rust/issues/129819
          }
 -        #[cfg(all(target_arch = "aarch64", not(feature = "generic_simd")))]
 +        #[cfg(all(
-+            target_arch = "aarch64", 
++            target_arch = "aarch64",
 +            target_endian = "little",
 +            not(feature = "generic_simd")
 +        ))]
Prev by Date: rust184: Revert libLLVM change.
Next by Date: rust184: Restore $ORIGIN rpath fix.
Previous by Thread: rust184: Revert libLLVM change.
Next by Thread: rust184: Restore $ORIGIN rpath fix.
Indexes:
Home | Main Index | Thread Index | Old Index