Skip to Content.
Sympa Menu

sm-commit - [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (10448562343c367508266a62c1fa762e214ec7cd)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (10448562343c367508266a62c1fa762e214ec7cd)
  • Date: Sat, 16 Mar 2024 16:47:45 +0000

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

devel/rust/HISTORY | 4 ++++
devel/rust/PRE_BUILD | 11 +++++++++++
devel/rust/patches/0001-libressl-3.4.x.patch | 11 +++++++----
3 files changed, 22 insertions(+), 4 deletions(-)

New commits:
commit 10448562343c367508266a62c1fa762e214ec7cd
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

devel/rust: allow building with LLVM 18 and LibreSSL 3.9.x

diff --git a/devel/rust/HISTORY b/devel/rust/HISTORY
index 78497ee..905448a 100644
--- a/devel/rust/HISTORY
+++ b/devel/rust/HISTORY
@@ -1,3 +1,7 @@
+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
+
2024-02-08 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.76.0

diff --git a/devel/rust/PRE_BUILD b/devel/rust/PRE_BUILD
index 29f1a1b..b45a078 100755
--- a/devel/rust/PRE_BUILD
+++ b/devel/rust/PRE_BUILD
@@ -1,3 +1,4 @@
+. "${GRIMOIRE}/FUNCTIONS" &&
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
apply_patch_dir patches &&
@@ -5,6 +6,16 @@ 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 89c762b..3791cf1 100644
--- a/devel/rust/patches/0001-libressl-3.4.x.patch
+++ b/devel/rust/patches/0001-libressl-3.4.x.patch
@@ -1,8 +1,7 @@
diff --git a/vendor/openssl-sys/build/cfgs.rs
b/vendor/openssl-sys/build/cfgs.rs
-index 960515f..f901e5a 100644
--- a/vendor/openssl-sys/build/cfgs.rs
+++ b/vendor/openssl-sys/build/cfgs.rs
-@@ -53,6 +53,12 @@ pub fn get(openssl_version: Option<u64>,
libressl_version: Option<u64>) -> Vec<&
+@@ -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");
}
@@ -12,18 +11,22 @@ index 960515f..f901e5a 100644
+ 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
-index 3359165..d5913ce 100644
--- a/vendor/openssl-sys/build/main.rs
+++ b/vendor/openssl-sys/build/main.rs
-@@ -274,6 +274,7 @@ See rust-openssl documentation for more information:
+@@ -273,6 +273,9 @@ See rust-openssl documentation for more information:
(3, 7, 1) => ('3', '7', '1'),
(3, 7, _) => ('3', '7', 'x'),
(3, 8, 0) => ('3', '8', '0'),
+ (3, 8, _) => ('3', '8', 'x'),
++ (3, 9, 0) => ('3', '9', '0'),
++ (3, 9, _) => ('3', '9', 'x'),
_ => version_error(),
};



  • [[SM-Commit] ] GIT changes to master grimoire by Pavel Vinogradov (10448562343c367508266a62c1fa762e214ec7cd), Pavel Vinogradov, 03/16/2024

Archive powered by MHonArc 2.6.24.

Top of Page