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/BUILD                                      |   11 +++---
 devel/rust/DETAILS                                    |    2 -
 devel/rust/HISTORY                                    |    9 +++++
 devel/rust/INSTALL                                    |    3 +
 devel/rust/PRE_BUILD                                  |   11 ------
 devel/rust/patches/0001-libressl-3.4.x.patch          |   26 +--------------
 devel/rust/patches/0006-Link-with-ssp_nonshared.patch |   30 
------------------
 7 files changed, 20 insertions(+), 72 deletions(-)

New commits:
commit 70073999dd7b42ca60b6c231bc5c2c7609022641
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

    devel/rust: version 1.77.0

diff --git a/devel/rust/BUILD b/devel/rust/BUILD
index faf9313..8d27ca3 100755
--- a/devel/rust/BUILD
+++ b/devel/rust/BUILD
@@ -35,7 +35,6 @@ message "${MESSAGE_COLOR}OPTS=$OPTS${DEFAULT_COLOR}" &&
            --enable-locked-deps \
            --enable-vendor \
            --enable-extended \
-           --enable-missing-tools \
           --disable-docs \
            --enable-llvm-link-shared \
         --llvm-root=$INSTALL_ROOT/usr \
@@ -44,14 +43,14 @@ message "${MESSAGE_COLOR}OPTS=$OPTS${DEFAULT_COLOR}" &&
 
 # various switches to disable static build, downloading and using llvm
 # toolchain from rust CI and to set user profile
-sed -e '/^#crt-static/acrt-static = false' \
-    -e '/^#download-ci-llvm/adownload-ci-llvm = false' \
-    -e '/^#llvm-tools/allvm-tools = false' \
-    -e '/^#profile /aprofile = "user"' -i config.toml &&
+sed -e "s;profile =.*;profile = 'user';" \
+    -e '/^\[llvm\]/adownload-ci-llvm = false' \
+    -e '/^\[build\]/aoptimized-compiler-builtins = false' -i config.toml &&
 
 export CARGO_HOME="$SOURCE_DIRECTORY/cargo_home" &&
 
-python3 ./x.py build  --config="${SOURCE_DIRECTORY}/config.toml" 
-j"${MAKE_NJOBS:-1}" &&
+python3 ./x.py build  --config="${SOURCE_DIRECTORY}/config.toml" \
+-j $((${#DISTCC_HOSTS[*]} * JOBS_PER_HOST + MAKE_NJOBS)) &&
 
 # fake install
 if spell_ok "${SPELL}"; then
diff --git a/devel/rust/DETAILS b/devel/rust/DETAILS
index bf3adfa..80b8dc4 100755
--- a/devel/rust/DETAILS
+++ b/devel/rust/DETAILS
@@ -1,5 +1,5 @@
            SPELL=rust
-         VERSION=1.76.0
+         VERSION=1.77.0
   SECURITY_PATCH=3
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/rustc-${VERSION}-src"
            TMPFS=off
diff --git a/devel/rust/HISTORY b/devel/rust/HISTORY
index 905448a..dcf7557 100644
--- a/devel/rust/HISTORY
+++ b/devel/rust/HISTORY
@@ -1,3 +1,12 @@
+2024-03-21 Pavel Vinogradov <public AT sourcemage.org>
+       * DETAILS: version 1.77.0
+       * PRE_BUILD: removed LLVM 18 fix
+       * patches/0001-libressl-3.4.x.patch: updated
+       * 0006-Link-with-ssp_nonshared.patch: dropped
+       * BUILD, INSTALL: enabled parallel/distributed compilation, fixed sed 
script
+         and removed obsolete flags, disabled optimized compiler builtins 
(caused
+         build issues)
+
 2024-03-16 Pavel Vinogradov <public AT sourcemage.org>
        * PRE_BUILD: added fix from LFS to allow building with LLVM 18
        * patches/0001-libressl-3.4.x.patch: updated
diff --git a/devel/rust/INSTALL b/devel/rust/INSTALL
index 3890aa6..063f8cf 100755
--- a/devel/rust/INSTALL
+++ b/devel/rust/INSTALL
@@ -10,5 +10,6 @@ else
   export CFLAGS CXXFLAGS &&
 
   export CARGO_HOME="$SOURCE_DIRECTORY/cargo_home" &&
-       DESTDIR="${INSTALL_ROOT}/" python3 ./x.py install 
--config="${SOURCE_DIRECTORY}/config.toml" -j"${MAKE_NJOBS:-1}"
+       DESTDIR="${INSTALL_ROOT}/" python3 ./x.py install 
--config="${SOURCE_DIRECTORY}/config.toml" \
+  -j $((${#DISTCC_HOSTS[*]} * JOBS_PER_HOST + MAKE_NJOBS))
 fi
diff --git a/devel/rust/PRE_BUILD b/devel/rust/PRE_BUILD
index b45a078..29f1a1b 100755
--- a/devel/rust/PRE_BUILD
+++ b/devel/rust/PRE_BUILD
@@ -1,4 +1,3 @@
-. "${GRIMOIRE}/FUNCTIONS" &&
 default_pre_build    &&
 cd "$SOURCE_DIRECTORY" &&
 apply_patch_dir patches &&
@@ -6,16 +5,6 @@ apply_patch_dir patches &&
 # Remove dependency on bash
 sedit '1s@bash$@sh@' src/tools/rust-installer/install-template.sh &&
 
-# for LLVM 18
-if spell_ok llvm && ! is_version_less "$(installed_version llvm)" "18.0.0"; 
then
-sed 's/f[0-9][0-9]:/i128:128-&/' \
-    -i compiler/rustc_target/src/spec/targets/i?86*.rs \
-       compiler/rustc_target/src/spec/targets/x86_64*.rs &&
-sed '/static_assert_size!\((Lit|MetaItemLit|BasicBlockData|Terminator)/d' \
-    -ri compiler/rustc_ast/src/ast.rs \
-        compiler/rustc_middle/src/mir/mod.rs
-fi &&
-
 # remove checksums to avoid failure with patched sources
 find vendor -name .cargo-checksum.json \
   -exec sed -i -e 's/\("files":{\)[^}]*/\1/' {}  \; &&
diff --git a/devel/rust/patches/0001-libressl-3.4.x.patch 
b/devel/rust/patches/0001-libressl-3.4.x.patch
index 3791cf1..a0276ff 100644
--- a/devel/rust/patches/0001-libressl-3.4.x.patch
+++ b/devel/rust/patches/0001-libressl-3.4.x.patch
@@ -1,30 +1,10 @@
-diff --git a/vendor/openssl-sys/build/cfgs.rs 
b/vendor/openssl-sys/build/cfgs.rs
---- a/vendor/openssl-sys/build/cfgs.rs
-+++ b/vendor/openssl-sys/build/cfgs.rs
-@@ -53,6 +53,15 @@ pub fn get(openssl_version: Option<u64>, 
libressl_version: Option<u64>) -> Vec<&
-         if libressl_version >= 0x3_07_00_00_0 {
-             cfgs.push("libressl370");
-         }
-+        if libressl_version >= 0x3_08_00_00_0 {
-+            cfgs.push("libressl380");
-+        }
-+        if libressl_version >= 0x3_08_00_01_0 {
-+            cfgs.push("libressl381");
-+        }
-+        if libressl_version >= 0x3_09_00_00_0 {
-+            cfgs.push("libressl390");
-+        }
-     } else {
-         let openssl_version = openssl_version.unwrap();
- 
 diff --git a/vendor/openssl-sys/build/main.rs 
b/vendor/openssl-sys/build/main.rs
 --- a/vendor/openssl-sys/build/main.rs
 +++ b/vendor/openssl-sys/build/main.rs
-@@ -273,6 +273,9 @@ See rust-openssl documentation for more information:
-             (3, 7, 1) => ('3', '7', '1'),
-             (3, 7, _) => ('3', '7', 'x'),
+@@ -293,6 +293,8 @@ See rust-openssl documentation for more information:
              (3, 8, 0) => ('3', '8', '0'),
-+            (3, 8, _) => ('3', '8', 'x'),
+             (3, 8, 1) => ('3', '8', '1'),
+             (3, 8, _) => ('3', '8', 'x'),
 +            (3, 9, 0) => ('3', '9', '0'),
 +            (3, 9, _) => ('3', '9', 'x'),
              _ => version_error(),
diff --git a/devel/rust/patches/0006-Link-with-ssp_nonshared.patch 
b/devel/rust/patches/0006-Link-with-ssp_nonshared.patch
deleted file mode 100644
index ce5465a..0000000
--- a/devel/rust/patches/0006-Link-with-ssp_nonshared.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7002d81e5e161c4d43301ebfb1d535a7a5685587 Mon Sep 17 00:00:00 2001
-From: Ismael Luceno <ismael AT iodev.co.uk>
-Date: Wed, 21 Sep 2022 08:07:25 +0200
-Subject: [PATCH 06/10] Link with libssp_nonshared and libexecinfo
-
-[ismael AT iodev.co.uk: Adjusted based on patches from Void and Alpine for 
1.63.0]
-Signed-off-by: Ismael Luceno <ismael AT iodev.co.uk>
----
- library/std/build.rs        | 2 ++
- library/unwind/build.rs     | 3 +++
- vendor/libc/src/unix/mod.rs | 6 +++---
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
-diff --git a/library/std/src/sys/unix/mod.rs 
b/library/std/src/sys/unix/mod.rs
-index 34a023b02..934a87570 100644
---- a/library/std/src/sys/unix/mod.rs
-+++ b/library/std/src/sys/unix/mod.rs
-@@ -297,6 +297,10 @@ cfg_if::cfg_if! {
-         #[link(name = "dl")]
-         #[link(name = "log")]
-         extern "C" {}
-+    } else if #[cfg(all(target_os = "linux", target_env = "musl"))] {
-+        #[link(name = "ssp_nonshared")]
-+        #[link(name = "execinfo")]
-+        extern "C" {}
-     } else if #[cfg(target_os = "freebsd")] {
-         #[link(name = "execinfo")]
-         #[link(name = "pthread")]
---
-2.30.0