pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust184: Fix make test.
Module Name: pkgsrc-wip
Committed By: Jonathan Perkin <jperkin%smartos.org@localhost>
Pushed By: jperkin
Date: Tue Feb 4 17:14:54 2025 +0000
Changeset: bb64e536be7e3ddb5b269f090de994c3ffd08b52
Modified Files:
rust184/Makefile
rust184/distinfo
rust184/patches/patch-compiler_rustc__llvm_build.rs
rust184/patches/patch-src_bootstrap_bootstrap.py
rust184/patches/patch-src_bootstrap_src_lib.rs
rust184/patches/patch-vendor_bytecount-0.6.8_src_lib.rs
Added Files:
rust184/patches/patch-tests_assembly_targets_targets-elf.rs
Log Message:
rust184: 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=bb64e536be7e3ddb5b269f090de994c3ffd08b52
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust184/Makefile | 2 +-
rust184/distinfo | 9 +++++----
rust184/patches/patch-compiler_rustc__llvm_build.rs | 14 +++++++-------
rust184/patches/patch-src_bootstrap_bootstrap.py | 2 +-
rust184/patches/patch-src_bootstrap_src_lib.rs | 2 +-
.../patches/patch-tests_assembly_targets_targets-elf.rs | 16 ++++++++++++++++
rust184/patches/patch-vendor_bytecount-0.6.8_src_lib.rs | 2 +-
7 files changed, 32 insertions(+), 15 deletions(-)
diffs:
diff --git a/rust184/Makefile b/rust184/Makefile
index fdaf513219..dbfbbf4dab 100644
--- a/rust184/Makefile
+++ b/rust184/Makefile
@@ -463,7 +463,7 @@ CKSUMS+= 27f9bff08b24828e1a611b10a0282f5457d12e9e7254202040144d392297d720
CKSUM_CRATES+= vendor/bytecount-0.6.8
CKSUMS+= 01cd755a128d8a5892f3edda195b26bb461be375be17dd72e6e4f061169e6dff
-CKSUMS+= a6750c0e2a6c385ec902cd7f87de7835fe2b4171b9c83da64122274ee20a77c6
+CKSUMS+= 7c6609685c161ac6b2c667f59bd6476c5c14c7269ec949fb2def5a0238198c25
CKSUM_CRATES+= vendor/line-index-0.1.2
CKSUMS+= c4613b718951cf0b880a3a7829e102a9ec7196591437e3bc0cfd857c717bfb61
diff --git a/rust184/distinfo b/rust184/distinfo
index db2845ceb7..21b6e92a2d 100644
--- a/rust184/distinfo
+++ b/rust184/distinfo
@@ -109,7 +109,7 @@ BLAKE2s (rustc-1.84.1-src.tar.gz) = 37355f615fac0b9c610a35e9c1c5445acd16881717e1
SHA512 (rustc-1.84.1-src.tar.gz) = 4e9f37e794488553cc2c9f642aca72eb0960beffcd32df8f0921133df28b7ddbd02263c7a62e0090da1904cf528cac509a68204cfe4bc4cc54134b0ab46cee08
Size (rustc-1.84.1-src.tar.gz) = 733474328 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_lib.rs) = d29bc3c0b335d5e788eecbb02fc08966beef0fb1
SHA1 (patch-src_bootstrap_src_core_builder_cargo.rs) = 2021265bb1370f4d20af5a9878326fc68451de6d
+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) = 333ec513b9b94750b2424a7c1b21c809e6ea25b8
SHA1 (patch-src_tools_rust-installer_install-template.sh) = 6984546c34a2e4d55a6dbe59baa0d4958184e0b7
+SHA1 (patch-tests_assembly_targets_targets-elf.rs) = ee7d036c055ed2a2b3b303f381ad4694327c739b
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_line-index-0.1.2_src_lib.rs) = 30aa5c82630ea0e8969abb527c11640712efba1e
diff --git a/rust184/patches/patch-compiler_rustc__llvm_build.rs b/rust184/patches/patch-compiler_rustc__llvm_build.rs
index 4edd1eebea..74346dbe8e 100644
--- a/rust184/patches/patch-compiler_rustc__llvm_build.rs
+++ b/rust184/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/rust184/patches/patch-src_bootstrap_bootstrap.py b/rust184/patches/patch-src_bootstrap_bootstrap.py
index badc6a4583..3a4f4fa1bb 100644
--- a/rust184/patches/patch-src_bootstrap_bootstrap.py
+++ b/rust184/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/rust184/patches/patch-src_bootstrap_src_lib.rs b/rust184/patches/patch-src_bootstrap_src_lib.rs
index d3d2e25ffb..e7ca14bda1 100644
--- a/rust184/patches/patch-src_bootstrap_src_lib.rs
+++ b/rust184/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/rust184/patches/patch-tests_assembly_targets_targets-elf.rs b/rust184/patches/patch-tests_assembly_targets_targets-elf.rs
new file mode 100644
index 0000000000..8a2594e503
--- /dev/null
+++ b/rust184/patches/patch-tests_assembly_targets_targets-elf.rs
@@ -0,0 +1,16 @@
+$NetBSD$
+
+Fix test suite.
+
+--- tests/assembly/targets/targets-elf.rs.orig 2025-02-04 16:02:52.680691048 +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/rust184/patches/patch-vendor_bytecount-0.6.8_src_lib.rs b/rust184/patches/patch-vendor_bytecount-0.6.8_src_lib.rs
index 8726eb0b2e..d587a1a864 100644
--- a/rust184/patches/patch-vendor_bytecount-0.6.8_src_lib.rs
+++ b/rust184/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")
+ ))]
Home |
Main Index |
Thread Index |
Old Index