pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
rust175: avoid .old files in the package
Module Name: pkgsrc-wip
Committed By: Adam Ciarciński <aciarcinski%teonite.com@localhost>
Pushed By: adam
Date: Mon Jan 22 11:38:03 2024 +0100
Changeset: d761ffb4f279fa84567e53ab869c86ed26acf59f
Modified Files:
rust175/Makefile
rust175/distinfo
rust175/patches/patch-src_tools_rust-installer_install-template.sh
Added Files:
rust175/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs
Removed Files:
rust175/patches/patch-compiler_rustc__target_src_spec_target_mips64el__unknown__netbsd.rs
Log Message:
rust175: avoid .old files in the package
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=d761ffb4f279fa84567e53ab869c86ed26acf59f
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
rust175/Makefile | 5 ++--
rust175/distinfo | 4 +--
...et_src_spec_target_mips64el__unknown__netbsd.rs | 29 ----------------------
...t_src_spec_targets_mips64el__unknown__netbsd.rs | 29 ++++++++++++++++++++++
...ch-src_tools_rust-installer_install-template.sh | 19 +++++++++++---
5 files changed, 48 insertions(+), 38 deletions(-)
diffs:
diff --git a/rust175/Makefile b/rust175/Makefile
index 77c855886e..89241a4aac 100644
--- a/rust175/Makefile
+++ b/rust175/Makefile
@@ -13,10 +13,9 @@ LICENSE= mit OR apache-2.0
CONFLICTS+= rust-bin-[0-9]*
# LLVM uses -std=c++17
-USE_CXX_FEATURES+= c++17
-
+USE_CXX_FEATURES+= c++17
USE_GCC_RUNTIME= yes
-USE_LANGUAGES= c c++17
+USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= bash grep gmake perl:build pkg-config
diff --git a/rust175/distinfo b/rust175/distinfo
index 33beb36ca3..863354ad42 100644
--- a/rust175/distinfo
+++ b/rust175/distinfo
@@ -118,7 +118,7 @@ SHA1 (patch-compiler_rustc__codegen__ssa_src_back_linker.rs) = 62819cf6db7d2e3e7
SHA1 (patch-compiler_rustc__llvm_build.rs) = a4a66d449fc9eb99d648d02a041778a68f4f7ce8
SHA1 (patch-compiler_rustc__target_src_spec_base_netbsd.rs) = 7fb6ec6d45a9bf4525c675390117e9e61b8023cd
SHA1 (patch-compiler_rustc__target_src_spec_mod.rs) = a22b5d28997ed9a5565deec9c34322165d563d00
-SHA1 (patch-compiler_rustc__target_src_spec_target_mips64el__unknown__netbsd.rs) = d38c3b43656917e60312a842e6a0c37776bbd5d0
+SHA1 (patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs) = d38c3b43656917e60312a842e6a0c37776bbd5d0
SHA1 (patch-library_backtrace_src_symbolize_gimli.rs) = 1ab343595e65ff6348f83cffc30e53d764485ff8
SHA1 (patch-library_backtrace_src_symbolize_gimli_elf.rs) = 3b84a462c6bc8245d579452e4c37e3ce13314952
SHA1 (patch-library_std_src_sys_unix_mod.rs) = f8669d680f169137ac2891af2977909619366a97
@@ -137,7 +137,7 @@ SHA1 (patch-src_llvm-project_llvm_lib_Support_BLAKE3_blake3__impl.h) = 67e93f198
SHA1 (patch-src_llvm-project_llvm_utils_FileCheck_FileCheck.cpp) = 2587c2f4d11ad8f75bf8a16de625135b26bacc15
SHA1 (patch-src_tools_cargo_src_cargo_core_profiles.rs) = e1af7fde97416e0a269ee34efd37f4f47fcf7a95
SHA1 (patch-src_tools_cargo_tests_testsuite_build.rs) = 60713699c968f3e389f486e796009d31a5048906
-SHA1 (patch-src_tools_rust-installer_install-template.sh) = 28fbfd37793c8438a603cb0e19483bd5b9138e4b
+SHA1 (patch-src_tools_rust-installer_install-template.sh) = 6984546c34a2e4d55a6dbe59baa0d4958184e0b7
SHA1 (patch-vendor_backtrace_src_symbolize_gimli.rs) = b93148ff72a60a17c6a444f2616386c40d872153
SHA1 (patch-vendor_backtrace_src_symbolize_gimli_elf.rs) = 308538090d9ce11d206d6eef0e675581a1fc6e80
SHA1 (patch-vendor_cc-1.0.73_src_lib.rs) = 98acea9fb98898f63bbb0f6555df5e4b15da2b85
diff --git a/rust175/patches/patch-compiler_rustc__target_src_spec_target_mips64el__unknown__netbsd.rs b/rust175/patches/patch-compiler_rustc__target_src_spec_target_mips64el__unknown__netbsd.rs
deleted file mode 100644
index 710cf5ffdd..0000000000
--- a/rust175/patches/patch-compiler_rustc__target_src_spec_target_mips64el__unknown__netbsd.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-Provide a mips64el target with N32, suitable for NetBSD/mips64el.
-
---- compiler/rustc_target/src/spec/targets/mips64el_unknown_netbsd.rs.orig 2024-01-13 14:16:30.122042614 +0000
-+++ compiler/rustc_target/src/spec/targets/mips64el_unknown_netbsd.rs
-@@ -0,0 +1,22 @@
-+use crate::abi::Endian;
-+use crate::spec::{base, Target, TargetOptions};
-+
-+pub fn target() -> Target {
-+ let mut base = base::netbsd::opts();
-+ base.max_atomic_width = Some(32);
-+ base.cpu = "mips32".into();
-+
-+ Target {
-+ llvm_target: "mipsel-unknown-netbsd".into(),
-+ pointer_width: 32,
-+ data_layout: "e-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64".into(),
-+ arch: "mips".into(),
-+ options: TargetOptions {
-+ abi: "n32".into(),
-+ features: "+soft-float,+abi=n32".into(),
-+ endian: Endian::Little,
-+ mcount: "__mcount".into(),
-+ ..base
-+ },
-+ }
-+}
diff --git a/rust175/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs b/rust175/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs
new file mode 100644
index 0000000000..710cf5ffdd
--- /dev/null
+++ b/rust175/patches/patch-compiler_rustc__target_src_spec_targets_mips64el__unknown__netbsd.rs
@@ -0,0 +1,29 @@
+$NetBSD$
+
+Provide a mips64el target with N32, suitable for NetBSD/mips64el.
+
+--- compiler/rustc_target/src/spec/targets/mips64el_unknown_netbsd.rs.orig 2024-01-13 14:16:30.122042614 +0000
++++ compiler/rustc_target/src/spec/targets/mips64el_unknown_netbsd.rs
+@@ -0,0 +1,22 @@
++use crate::abi::Endian;
++use crate::spec::{base, Target, TargetOptions};
++
++pub fn target() -> Target {
++ let mut base = base::netbsd::opts();
++ base.max_atomic_width = Some(32);
++ base.cpu = "mips32".into();
++
++ Target {
++ llvm_target: "mipsel-unknown-netbsd".into(),
++ pointer_width: 32,
++ data_layout: "e-m:m-p:32:32-i8:8:32-i16:16:32-i64:64-n32-S64".into(),
++ arch: "mips".into(),
++ options: TargetOptions {
++ abi: "n32".into(),
++ features: "+soft-float,+abi=n32".into(),
++ endian: Endian::Little,
++ mcount: "__mcount".into(),
++ ..base
++ },
++ }
++}
diff --git a/rust175/patches/patch-src_tools_rust-installer_install-template.sh b/rust175/patches/patch-src_tools_rust-installer_install-template.sh
index e6f15d3a65..d4036445de 100644
--- a/rust175/patches/patch-src_tools_rust-installer_install-template.sh
+++ b/rust175/patches/patch-src_tools_rust-installer_install-template.sh
@@ -2,13 +2,14 @@ $NetBSD: patch-src_tools_rust-installer_install-template.sh,v 1.5 2021/06/09 13:
No logging to 'install.log'.
Do not create 'uninstall.sh'.
+Do not make file backups (filename.old), so these will not end up in the final package.
Rewrite to not use a whole lot of subprocesses just for doing
pattern matching and substitution in the install phase using "grep"
and "sed" when shell builtin "case" and "omit shortest match" ops
should do just fine.
---- src/tools/rust-installer/install-template.sh.orig 2021-05-09 02:52:58.000000000 +0000
+--- src/tools/rust-installer/install-template.sh.orig 2023-12-21 16:55:28.000000000 +0000
+++ src/tools/rust-installer/install-template.sh
@@ -6,20 +6,12 @@ set -u
init_logging() {
@@ -134,10 +135,12 @@ should do just fine.
# Make sure there's a directory for it
make_dir_recursive "$(dirname "$_file_install_path")"
-@@ -617,14 +600,16 @@ install_components() {
+@@ -615,16 +598,16 @@ install_components() {
- maybe_backup_path "$_file_install_path"
+ verbose_msg "copying file $_file_install_path"
+- maybe_backup_path "$_file_install_path"
+-
- if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file"
- then
- run cp "$_src_dir/$_component/$_file" "$_file_install_path"
@@ -158,7 +161,15 @@ should do just fine.
critical_need_ok "file creation failed"
# Update the manifest
-@@ -986,7 +971,6 @@ write_to_file "$TEMPLATE_RUST_INSTALLER_
+@@ -637,7 +620,6 @@ install_components() {
+
+ verbose_msg "copying directory $_file_install_path"
+
+- maybe_backup_path "$_file_install_path"
+
+ run cp -R "$_src_dir/$_component/$_file" "$_file_install_path"
+ critical_need_ok "failed to copy directory"
+@@ -986,7 +968,6 @@ write_to_file "$TEMPLATE_RUST_INSTALLER_
critical_need_ok "failed to write installer version"
# Install the uninstaller
Home |
Main Index |
Thread Index |
Old Index