Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (b5fce500ab0e5d8373e03c077e9d95d8c1e58764)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (b5fce500ab0e5d8373e03c077e9d95d8c1e58764)
  • Date: Tue, 3 Aug 2021 23:16:45 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

devel/rust/BUILD | 9 ++++++++-
devel/rust/HISTORY | 5 +++++
devel/rust/PRE_BUILD | 3 ++-
3 files changed, 15 insertions(+), 2 deletions(-)

New commits:
commit b5fce500ab0e5d8373e03c077e9d95d8c1e58764
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

devel/rust: disable usage of system rustc, as it could be broken or too
old in unpredictable ways

diff --git a/devel/rust/BUILD b/devel/rust/BUILD
index 759adac..0182b3e 100755
--- a/devel/rust/BUILD
+++ b/devel/rust/BUILD
@@ -1,7 +1,14 @@
export CLANG_INSTALL_DIR=/usr &&
CFLAGS="${CFLAGS//-DPIC}" &&
CXXFLAGS="${CXXFLAGS//-DPIC}" &&
-if spell_ok "$SPELL"; then
+# NEVER use the rust in /usr.
+# 1. It will be too old in the general case. We'd need to ensure taking
+# each release step.
+# 2. It will be broken right now, anyway, as we just updated LLVM and
+# /usr/bin/rustc will be missing its soversion. You cannot win.
+# Maybe we need our own bootstrap packages. Or a chain build starting
+# with the latest available cache.
+if false && spell_ok "$SPELL"; then
_rust_root="$INSTALL_ROOT/usr"
else
_rust_root="$SOURCE_DIRECTORY/stage0-bootstrap" &&
diff --git a/devel/rust/HISTORY b/devel/rust/HISTORY
index f924512..d03e9ec 100644
--- a/devel/rust/HISTORY
+++ b/devel/rust/HISTORY
@@ -1,3 +1,8 @@
+2021-08-03 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, BUILD: Do not try to use installed rust, as that
+ will be either too old or broken because of recent LLVM
+ update.
+
2021-07-29 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.54.0
* DEPENDS: allow llvm >= 12.0
diff --git a/devel/rust/PRE_BUILD b/devel/rust/PRE_BUILD
index e556445..2304dba 100755
--- a/devel/rust/PRE_BUILD
+++ b/devel/rust/PRE_BUILD
@@ -7,7 +7,8 @@ sed -i 's/"files":{[^}]*}/"files":{}/' \
vendor/{libc,openssl-sys}/.cargo-checksum.json &&

# Bootstrapping
-if ! spell_ok "$SPELL"; then
+# Installed rust will in general NOT WORK!
+if true || ! spell_ok "$SPELL"; then
unpack_file 3 &&
unpack_file 4 &&
unpack_file 5



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (b5fce500ab0e5d8373e03c077e9d95d8c1e58764), Thomas Orgis, 08/03/2021

Archive powered by MHonArc 2.6.24.

Top of Page