Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 devel/rust/BUILD     |   17 ++++++++++++++---
 devel/rust/DETAILS   |   26 +++++++++++++++++++++++---
 devel/rust/HISTORY   |    3 +++
 devel/rust/PRE_BUILD |   10 +++++++++-
 4 files changed, 49 insertions(+), 7 deletions(-)

New commits:
commit 31198c4ba487767af0301fd8858841df47936145
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    rust: Rework bootstrapping
    
    Download the bootstrapping toolchain from the spell to avoid network
    dependencies.
    
    This also allows us to bootstrap from the same rust version.
    
    Downloads:
     - rust-std
     - rustc
     - cargo

diff --git a/devel/rust/BUILD b/devel/rust/BUILD
index 8ee2592..cad4a52 100755
--- a/devel/rust/BUILD
+++ b/devel/rust/BUILD
@@ -1,12 +1,23 @@
 export CLANG_INSTALL_DIR=/usr &&
 CXXFLAGS="${CXXFLAGS//-DPIC}" &&
-if spell_ok $SPELL;then
-  OPTS+=" --enable-local-rust --local-rust-root=$INSTALL_ROOT/usr"
+if spell_ok "$SPELL"; then
+  _rust_root="$INSTALL_ROOT/usr"
+else
+  _rust_root="$SOURCE_DIRECTORY/stage0-bootstrap" &&
+  install -D -m555 -t "$_rust_root"/bin "${SOURCE3%.tar.xz}"/cargo/bin/cargo 
&&
+  for i in "$SOURCE4" "$SOURCE5"; do
+    ./"${i%.tar.xz}"/install.sh \
+        --destdir="$_rust_root" --prefix=/ --disable-ldconfig || break
+  done
 fi &&
 ./configure \
        --build="${BUILD/-pc-/-unknown-}" \
        --prefix="$INSTALL_ROOT"/usr \
-       --enable-extended \
+       --enable-local-rust \
+       --local-rust-root="$_rust_root" \
+       --enable-locked-deps \
+       --enable-vendor \
+       --disable-extended \
        --disable-docs \
        --enable-llvm-link-shared \
        $OPTS &&
diff --git a/devel/rust/DETAILS b/devel/rust/DETAILS
index 78dfd0b..03b3827 100755
--- a/devel/rust/DETAILS
+++ b/devel/rust/DETAILS
@@ -1,13 +1,33 @@
            SPELL=rust
          VERSION=1.36.0
-          SOURCE=rustc-$VERSION-src.tar.gz
+   CARGO_VERSION=0.37.0
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/rustc-$VERSION-src
            TMPFS=off
-   SOURCE_URL[0]=https://static.rust-lang.org/dist/$SOURCE
+          SOURCE=rustc-$VERSION-src.tar.xz
          SOURCE2=$SOURCE.asc
-  SOURCE2_URL[0]=${SOURCE_URL[0]}.asc
+         SOURCE3="cargo-$CARGO_VERSION-${BUILD/-pc-/-unknown-}.tar.xz"
+         SOURCE4="rust-std-$VERSION-${BUILD/-pc-/-unknown-}.tar.xz"
+         SOURCE5="rustc-$VERSION-${BUILD/-pc-/-unknown-}.tar.xz"
+        DIST_URL=https://static.rust-lang.org/dist
+      SOURCE_URL=("$DIST_URL/$SOURCE")
+     SOURCE2_URL=("${SOURCE_URL[0]}.asc")
+     SOURCE3_URL=("$DIST_URL/$SOURCE3")
+     SOURCE4_URL=("$DIST_URL/$SOURCE4")
+     SOURCE5_URL=("$DIST_URL/$SOURCE5")
       SOURCE_GPG=rust.gpg:$SOURCE.asc:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
+case "${BUILD/-pc-/-unknown-}" in
+x86_64-unknown-linux-musl)
+    
SOURCE3_HASH=sha512:feb17c5b3687e2d10274162429c217b7ff53db090bcd5fc85611889639754009e162227d48d6f9b38eb930c22a52f3c04518dbac86e768c8681688395dce8ee9
+    
SOURCE4_HASH=sha512:169efc9c80366f2ed884f191d27ce67d5d3cb5d0579fd26afbe810be01f437f0aa7f20cc9c5d7fd4e27afe7836e89006f335dad4df8b8a8b815328061d7123dd
+    
SOURCE5_HASH=sha512:53f3225607a7bcfa7a66415d3e5b064747391ef760fb6ba68fdddb45129c0412733af2c555f1dc62d7f80d0718253470ddfe2b341dec9cdead9e876e44539f04
+  ;;
+x86_64-unknown-linux-gnu)
+    
SOURCE3_HASH=sha512:bf1d6d569df941be326be8f57bb1c350ac087946e3873ad1add3477d8d1abd71562d452ea4739b64f80c3c24d0cb2eb37cf6aaf46e8af1753fc7bb7d2e0e6697
+    
SOURCE4_HASH=sha512:86fd1e1deb1aa7d6e0eac3421adb4e6226fed8f8557b822bb7ea251f6d16c56bd5f362d93a76607809c1c731e6f061a6aa63f6db3afc014592b9a6c6f829f49a
+    
SOURCE5_HASH=sha512:d49e20c4c63cf08819ea41d0f7c483ac7f943e30fd9b1d644faffb18677c882e1d494c13fa2be77a82371c4319aece5c1fd1d3b826c5dac491b3ee51f5701bea
+  ;;
+esac
         WEB_SITE=https://www.rust-lang.org/
          ENTERED=20130529
       LICENSE[0]=MIT
diff --git a/devel/rust/HISTORY b/devel/rust/HISTORY
index 1b3e233..b1a73fb 100644
--- a/devel/rust/HISTORY
+++ b/devel/rust/HISTORY
@@ -1,3 +1,6 @@
+2019-08-14 Ismael Luceno <ismael AT iodev.co.uk>
+       * BUILD, DETAILS, PRE_BUILD: reworked bootstrapping
+
 2019-07-04 Pavel Vinogradov <public AT sourcemage.org>
        * DETAILS: version 1.36.0
 
diff --git a/devel/rust/PRE_BUILD b/devel/rust/PRE_BUILD
index 805f8f5..8d1e5ba 100755
--- a/devel/rust/PRE_BUILD
+++ b/devel/rust/PRE_BUILD
@@ -1,6 +1,14 @@
 default_pre_build    &&
-cd $SOURCE_DIRECTORY &&
+cd "$SOURCE_DIRECTORY" &&
 apply_patch_dir patches &&
+
+# Bootstrapping
+if ! spell_ok "$SPELL"; then
+  unpack_file 3 &&
+  unpack_file 4 &&
+  unpack_file 5
+fi &&
+
 # avoid rebuilding llvm
 rm -r src/llvm-project &&