Skip to Content.
Sympa Menu

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

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 (76f70a9a022989234e191edfd2cd68faee222f50)
  • Date: Tue, 13 Sep 2022 02:24:27 +0000

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

devel/rust/BUILD | 10 ++++++++--
devel/rust/DETAILS | 12 +++++++-----
devel/rust/HISTORY | 4 ++++
devel/rust/INSTALL | 10 ++++++++--
devel/rust/PRE_BUILD | 2 +-
5 files changed, 28 insertions(+), 10 deletions(-)

New commits:
commit 76f70a9a022989234e191edfd2cd68faee222f50
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

devel/rust: reenabled bootstrapping using system rust

diff --git a/devel/rust/BUILD b/devel/rust/BUILD
index 915348e..73a0df9 100755
--- a/devel/rust/BUILD
+++ b/devel/rust/BUILD
@@ -15,7 +15,7 @@ export CFLAGS CXXFLAGS &&
# /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
+if spell_ok "$SPELL"; then
_rust_root="$INSTALL_ROOT/usr"
else
_rust_root="$SOURCE_DIRECTORY/stage0-bootstrap" &&
@@ -47,4 +47,10 @@ sed -i "/BOOTSTRAP.*doc/d" Makefile &&

export CARGO_HOME="$SOURCE_DIRECTORY/cargo_home" &&

-default_build_make
+default_build_make &&
+
+# fake install
+if spell_ok "${SPELL}"; then
+ mkdir -p "${SOURCE_DIRECTORY}/INSTALL_ROOT" &&
+ make DESTDIR="${SOURCE_DIRECTORY}/INSTALL_ROOT" install
+fi
diff --git a/devel/rust/DETAILS b/devel/rust/DETAILS
index 1a3d09a..cabdc0d 100755
--- a/devel/rust/DETAILS
+++ b/devel/rust/DETAILS
@@ -5,6 +5,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/rustc-$VERSION-src
TMPFS=off
SOURCE=rustc-$VERSION-src.tar.xz
SOURCE2=$SOURCE.asc
+ DIST_URL=https://static.rust-lang.org/dist
+ SOURCE_URL[0]="$DIST_URL/$SOURCE"
+ SOURCE2_URL[0]="${SOURCE_URL[0]}.asc"
+ SOURCE_GPG=rust.gpg:$SOURCE.asc:UPSTREAM_KEY
+ SOURCE2_IGNORE=signature
+if ! spell_ok "${SPELL}"; then
BUILDX="${BUILD/-pc-/-unknown-}"
SOURCE3="cargo-$VERSION-${BUILDX}.tar.xz"
SOURCE4="rust-std-$VERSION-${BUILDX}.tar.xz"
@@ -12,23 +18,19 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/rustc-$VERSION-src
SOURCE6=$SOURCE3.asc
SOURCE7=$SOURCE4.asc
SOURCE8=$SOURCE5.asc
- DIST_URL=https://static.rust-lang.org/dist
- SOURCE_URL[0]="$DIST_URL/$SOURCE"
- SOURCE2_URL[0]="${SOURCE_URL[0]}.asc"
SOURCE3_URL[0]="$DIST_URL/$SOURCE3"
SOURCE4_URL[0]="$DIST_URL/$SOURCE4"
SOURCE5_URL[0]="$DIST_URL/$SOURCE5"
SOURCE6_URL[0]="${SOURCE3_URL[0]}.asc"
SOURCE7_URL[0]="${SOURCE4_URL[0]}.asc"
SOURCE8_URL[0]="${SOURCE5_URL[0]}.asc"
- SOURCE_GPG=rust.gpg:$SOURCE.asc:UPSTREAM_KEY
SOURCE3_GPG=rust.gpg:$SOURCE6:UPSTREAM_KEY
SOURCE4_GPG=rust.gpg:$SOURCE7:UPSTREAM_KEY
SOURCE5_GPG=rust.gpg:$SOURCE8:UPSTREAM_KEY
- SOURCE2_IGNORE=signature
SOURCE6_IGNORE=signature
SOURCE7_IGNORE=signature
SOURCE8_IGNORE=signature
+fi
WEB_SITE=https://www.rust-lang.org/
ENTERED=20130529
LICENSE[0]=MIT
diff --git a/devel/rust/HISTORY b/devel/rust/HISTORY
index 4cf05f9..b284145 100644
--- a/devel/rust/HISTORY
+++ b/devel/rust/HISTORY
@@ -1,3 +1,7 @@
+2022-09-12 Pavel Vinogradov <public AT sourcemage.org>
+ * BUILD, DETAILS, INSTALL, PRE_BUILD: reenabled bootstrapping using
system
+ rust (kudos to binutils)
+
2022-09-07 Pavel Vinogradov <public AT sourcemage.org>
* patches/0009-llvm-15.patch: added for building with llvm 15

diff --git a/devel/rust/INSTALL b/devel/rust/INSTALL
index 623ced8..63ccc96 100755
--- a/devel/rust/INSTALL
+++ b/devel/rust/INSTALL
@@ -1,2 +1,8 @@
-export CARGO_HOME="$SOURCE_DIRECTORY/cargo_home" &&
-default_install
+if test -d "${SOURCE_DIRECTORY}/INSTALL_ROOT"; then
+ cd "${SOURCE_DIRECTORY}/INSTALL_ROOT" &&
+ find . | cpio --pass-through --make-directories --verbose --unconditional \
+ "${INSTALL_ROOT}/"
+else
+ export CARGO_HOME="$SOURCE_DIRECTORY/cargo_home" &&
+ default_install
+fi
diff --git a/devel/rust/PRE_BUILD b/devel/rust/PRE_BUILD
index 2304dba..4258968 100755
--- a/devel/rust/PRE_BUILD
+++ b/devel/rust/PRE_BUILD
@@ -8,7 +8,7 @@ sed -i 's/"files":{[^}]*}/"files":{}/' \

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



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (76f70a9a022989234e191edfd2cd68faee222f50), Pavel Vinogradov, 09/12/2022

Archive powered by MHonArc 2.6.24.

Top of Page