pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust187: Remove trailing whitetspace in patch. (Pull from main pkgsrc.)
Module Name: pkgsrc-wip
Committed By: Havard Eidnes <he%NetBSD.org@localhost>
Pushed By: he
Date: Tue Jun 17 15:54:36 2025 +0000
Changeset: f89df87c819c37c835c66270b0ada7bf4f86554c
Modified Files:
rust187/distinfo
rust187/patches/patch-src_bootstrap_src_lib.rs
Log Message:
rust187: Remove trailing whitetspace in patch. (Pull from main pkgsrc.)
This somehow got added during the 1.86.0 update, even though the hunk in
question did not change. Incorrect formatting breaks "tidy check" and thus
make test, which now works again.
Original commit from jperkin@
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=f89df87c819c37c835c66270b0ada7bf4f86554c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust187/distinfo | 2 +-
rust187/patches/patch-src_bootstrap_src_lib.rs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diffs:
diff --git a/rust187/distinfo b/rust187/distinfo
index 8d29474899..119bb2f85b 100644
--- a/rust187/distinfo
+++ b/rust187/distinfo
@@ -126,7 +126,7 @@ SHA1 (patch-src_bootstrap_bootstrap.py) = b2ccb6a2c3ca180a3a39493314d56285a7a6d8
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_cargo.rs) = b7ce18d045c2ef250817ee4b6ed57e0524d99e71
-SHA1 (patch-src_bootstrap_src_lib.rs) = de64427b7b03c89c7a16af48e88adbc1025e0a0f
+SHA1 (patch-src_bootstrap_src_lib.rs) = b90a3b9044c4ad92a7ba50a9e3388f6a91caf9c6
SHA1 (patch-src_llvm-project_llvm_CMakeLists.txt) = 446acdd51fb6ddcba733371263aa2f9949299d31
SHA1 (patch-src_llvm-project_llvm_cmake_modules_AddLLVM.cmake) = e1b2eb2f0b3cf1cf87b443656ae306b3242f6b12
SHA1 (patch-src_llvm-project_llvm_include_llvm-c_DataTypes.h) = cb011fc19957883c01725797f7c85ed1b20f96f1
diff --git a/rust187/patches/patch-src_bootstrap_src_lib.rs b/rust187/patches/patch-src_bootstrap_src_lib.rs
index 93ded4837c..8d8141a51f 100644
--- a/rust187/patches/patch-src_bootstrap_src_lib.rs
+++ b/rust187/patches/patch-src_bootstrap_src_lib.rs
@@ -18,7 +18,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());
}
Home |
Main Index |
Thread Index |
Old Index