Source Mage code commit list

[Pavel Vinogradov <scm AT sourcemage.org>]

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

 devel/rust/DETAILS                                                           
    |    2 
 devel/rust/HISTORY                                                           
    |    7 
 devel/rust/patches/0002-Fix-LLVM-build.patch                                 
    |   27 ---
 
devel/rust/patches/0005-Revert-Include-libunwind-in-the-rust-src-component.patch
 |   28 ---
 devel/rust/patches/0007-Link-stage2-tools-dynamically-to-libstd.patch        
    |   33 ----
 
devel/rust/patches/0013-allow-specifying-native-sysroot-to-use-for-linkage.patch
 |   78 ----------
 6 files changed, 8 insertions(+), 167 deletions(-)

New commits:
commit 4726ad5f6354c647246feedb783218a8c69204a2
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    devel/rust: version 1.75.0

diff --git a/devel/rust/DETAILS b/devel/rust/DETAILS
index 1285df1..ee87422 100755
--- a/devel/rust/DETAILS
+++ b/devel/rust/DETAILS
@@ -1,5 +1,5 @@
            SPELL=rust
-         VERSION=1.74.1
+         VERSION=1.75.0
   SECURITY_PATCH=3
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/rustc-${VERSION}-src"
            TMPFS=off
diff --git a/devel/rust/HISTORY b/devel/rust/HISTORY
index ac3cd4e..82adbec 100644
--- a/devel/rust/HISTORY
+++ b/devel/rust/HISTORY
@@ -1,3 +1,10 @@
+2023-12-28 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: version 1.75.0
+       * patches/0002-Fix-LLVM-build.patch,
+         
patches/0005-Revert-Include-libunwind-in-the-rust-src-component.patch,
+         patches/0007-Link-stage2-tools-dynamically-to-libstd.patch,
+         
patches/0013-allow-specifying-native-sysroot-to-use-for-linkage.patch: removed
+
 2023-12-07 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 1.74.1, quoting++
 
diff --git a/devel/rust/patches/0002-Fix-LLVM-build.patch 
b/devel/rust/patches/0002-Fix-LLVM-build.patch
deleted file mode 100644
index b555a0c..0000000
--- a/devel/rust/patches/0002-Fix-LLVM-build.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 584ab4467bb72f89bbc24445c29722c59bb27984 Mon Sep 17 00:00:00 2001
-From: Samuel Holland <samuel AT sholland.org>
-Date: Fri, 8 Sep 2017 00:04:29 -0500
-Subject: [PATCH 02/10] Fix LLVM build
-
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- src/bootstrap/lib.rs | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
-index ff8548a0f0bb..210084cf5ea6 100644
---- a/src/bootstrap/lib.rs
-+++ b/src/bootstrap/lib.rs
-@@ -834,7 +834,8 @@ impl Build {
-             .args()
-             .iter()
-             .map(|s| s.to_string_lossy().into_owned())
--            .filter(|s| !s.starts_with("-O") && !s.starts_with("/O"))
-+            .filter(|s| !s.starts_with("-O") && !s.starts_with("/O")
-+                    && !s.starts_with("-static"))
-             .collect::<Vec<String>>();
- 
-         // If we're compiling on macOS then we add a few unconditional flags
--- 
-2.30.0
-
diff --git 
a/devel/rust/patches/0005-Revert-Include-libunwind-in-the-rust-src-component.patch
 
b/devel/rust/patches/0005-Revert-Include-libunwind-in-the-rust-src-component.patch
deleted file mode 100644
index 2e9943b..0000000
--- 
a/devel/rust/patches/0005-Revert-Include-libunwind-in-the-rust-src-component.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f45773be74fc47e1be223b3821adeb71127496a1 Mon Sep 17 00:00:00 2001
-From: Johannes Brechtmann <johannes.brechtmann AT gmail.com>
-Date: Sun, 22 Nov 2020 16:00:50 +0100
-Subject: [PATCH 05/10] Revert "Include libunwind in the rust-src component."
-
-This reverts commit 9f27f3796d3487411ab035803a0757d69040649c.
-
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- src/bootstrap/dist.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
-index a72aa7282851..193238eec3f7 100644
---- a/src/bootstrap/dist.rs
-+++ b/src/bootstrap/dist.rs
-@@ -1028,7 +1028,7 @@ impl Step for Src {
-         copy_src_dirs(
-             builder,
-             &builder.src,
--            &["library", "src/llvm-project/libunwind"],
-+            &["library"],
-             &[
-                 // not needed and contains symlinks which rustup currently
-                 // chokes on when unpacking.
--- 
-2.30.0
-
diff --git 
a/devel/rust/patches/0007-Link-stage2-tools-dynamically-to-libstd.patch 
b/devel/rust/patches/0007-Link-stage2-tools-dynamically-to-libstd.patch
deleted file mode 100644
index e5836a7..0000000
--- a/devel/rust/patches/0007-Link-stage2-tools-dynamically-to-libstd.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 92e56e048bbb925ea3e8fde2e17b9fb10a961bb2 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel AT octaforge.org>
-Date: Sun, 3 May 2020 18:00:09 +0200
-Subject: [PATCH 07/10] Link stage2 tools dynamically to libstd
-
-Replaces an older patch by Samuel Holland. The RUSTC_NO_PREFER_DYNAMIC
-env var was removed and replaced with the following logic in builder.rs.
-
-The idea for this patch is to link stage2 tools dynamically as these will
-be distributed (if built). Intermediate tools from previous stages will
-be statically linked for convenience.
-
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- src/bootstrap/builder.rs | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index 3d724c148422..1dd53d5fa696 100644
---- a/src/bootstrap/builder.rs
-+++ b/src/bootstrap/builder.rs
-@@ -1404,6 +1404,8 @@ impl<'a> Builder<'a> {
-         // linking all deps statically into the dylib.
-         if matches!(mode, Mode::Std | Mode::Rustc) {
-             rustflags.arg("-Cprefer-dynamic");
-+        } else if stage >= 2 {
-+            rustflags.arg("-Cprefer-dynamic");
-         }
- 
-         // When building incrementally we default to a lower ThinLTO import 
limit
--- 
-2.30.0
-
diff --git 
a/devel/rust/patches/0013-allow-specifying-native-sysroot-to-use-for-linkage.patch
 
b/devel/rust/patches/0013-allow-specifying-native-sysroot-to-use-for-linkage.patch
deleted file mode 100644
index 97ea9b7..0000000
--- 
a/devel/rust/patches/0013-allow-specifying-native-sysroot-to-use-for-linkage.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 236c0272667d69380d03984cfa8bad44b033fd69 Mon Sep 17 00:00:00 2001
-From: Daniel Kolesa <daniel AT octaforge.org>
-Date: Tue, 21 Dec 2021 02:46:30 +0100
-Subject: [PATCH 13/15] allow specifying native sysroot to use for linkage
-
-This allows us to get around the linker attempting to use
-incompatible libs.
-
-Upstream-Status: Unknown
-Origin: Void Linux
-Signed-off-by: Ismael Luceno <ismael AT sourcemage.org>
----
- src/bootstrap/builder.rs | 4 ++++
- src/bootstrap/config.rs  | 3 +++
- src/bootstrap/lib.rs     | 4 ++++
- 3 files changed, 11 insertions(+)
-
-diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index 6a02a225c..483aa8818 100644
---- a/src/bootstrap/builder.rs
-+++ b/src/bootstrap/builder.rs
-@@ -1708,6 +1708,10 @@ impl<'a> Builder<'a> {
-             }
-         }
- 
-+        if let Some(sysroot) = self.native_sysroot(target) {
-+            rustflags.arg(&format!("-Clink-args=--sysroot={}", 
sysroot.display()));
-+        }
-+
-         if let Some(host_linker) = self.linker(compiler.host) {
-             cargo.env("RUSTC_HOST_LINKER", host_linker);
-         }
-diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index 18a764689..f8b9bbd96 100644
---- a/src/bootstrap/config.rs
-+++ b/src/bootstrap/config.rs
-@@ -395,6 +395,7 @@ pub struct Target {
-     pub ranlib: Option<PathBuf>,
-     pub default_linker: Option<PathBuf>,
-     pub linker: Option<PathBuf>,
-+    pub sysroot: Option<PathBuf>,
-     pub ndk: Option<PathBuf>,
-     pub sanitizers: Option<bool>,
-     pub profiler: Option<bool>,
-@@ -723,6 +724,7 @@ define_config! {
-         ranlib: Option<String> = "ranlib",
-         default_linker: Option<PathBuf> = "default-linker",
-         linker: Option<String> = "linker",
-+        sysroot: Option<String> = "sysroot",
-         llvm_config: Option<String> = "llvm-config",
-         llvm_filecheck: Option<String> = "llvm-filecheck",
-         llvm_libunwind: Option<String> = "llvm-libunwind",
-@@ -1156,6 +1158,7 @@ impl Config {
-                 target.ar = cfg.ar.map(PathBuf::from);
-                 target.ranlib = cfg.ranlib.map(PathBuf::from);
-                 target.linker = cfg.linker.map(PathBuf::from);
-+                target.sysroot = cfg.sysroot.map(PathBuf::from);
-                 target.crt_static = cfg.crt_static;
-                 target.wasi_root = cfg.wasi_root.map(PathBuf::from);
-                 target.qemu_rootfs = cfg.qemu_rootfs.map(PathBuf::from);
-diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
-index 0a7012dbd..cded50d20 100644
---- a/src/bootstrap/lib.rs
-+++ b/src/bootstrap/lib.rs
-@@ -1152,6 +1152,10 @@ impl Build {
-             self.config.target_config.get(&target).and_then(|t| 
t.crt_static)
-         }
-     }
-+    
-+    fn native_sysroot(&self, target: TargetSelection) -> Option<&Path> {
-+        self.config.target_config.get(&target).and_then(|c| 
c.sysroot.as_ref()).map(|p| &**p)
-+    }
- 
-     /// Returns the sysroot for the wasi target, if defined
-     fn wasi_root(&self, target: TargetSelection) -> Option<&Path> {
--- 
-2.37.2
-