development/rust: Updated for version 1.25.0.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

3 files changed, 40 insertions, 32 deletions

diff --git a/development/rust/README b/development/rust/README
index 3ec3ae0ccf..fdebb5dac5 100644
--- a/development/rust/README
+++ b/development/rust/README
@@ -3,10 +3,10 @@ prevents segfaults, and guarantees thread safety.
 
 Cargo - the Rust package manager - is included in this build.
 
-This script may take a while to complete (just over an hour for x86_64, just
-over 1.5 hours for x86 on a 10 core machine) and will require about 7 GB of
-disk space for its temporary directory. It defaults to "/tmp/SBo" and you may
-redefine it like this:
+This script may take a while to complete (just over an hour for x86_64, around
+1 hour 45 minutes for x86 - both on a 10 core machine) and will require about
+6.6GB (x86_64) / 7.1GB (x86) of disk space for its temporary directory. It
+defaults to "/tmp/SBo" and you may redefine it like this:
 
 TMP=/your/temporary/dir ./rust.SlackBuild
 
diff --git a/development/rust/rust.SlackBuild b/development/rust/rust.SlackBuild
index c007f91c22..0dd10d6ac4 100644
--- a/development/rust/rust.SlackBuild
+++ b/development/rust/rust.SlackBuild
@@ -26,12 +26,12 @@
 
 PRGNAM=rust
 SRCNAM="${PRGNAM}c"
-VERSION=${VERSION:-1.24.1}
+VERSION=${VERSION:-1.25.0}
 
 # src/stage0.txt
-RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.23.0}
-RSTAGE0_DIR=${RSTAGE0_DIR:-2018-01-04}
-CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.24.0}
+RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.24.0}
+RSTAGE0_DIR=${RSTAGE0_DIR:-2018-02-15}
+CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.25.0}
 CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR}
 
 BUILD=${BUILD:-1}
@@ -156,6 +156,9 @@ fi
 SYSTEM_LLVM=${SYSTEM_LLVM:-no}
 
 cat << EOF > config.toml
+[llvm]
+targets = "X86"
+
 [build]
 build = "$BARCH-unknown-linux-$BABI"
 host = ["$TARCH-unknown-linux-$BABI"]
@@ -173,12 +176,17 @@ mandir = "man"
 
 [rust]
 codegen-units = 0
+thinlto = false
 channel = "stable"
 rpath = true
 codegen-tests = false
 ignore-git = true
 EOF
 
+if [ "$ARCH" = "arm" ] ; then
+  sed -i 's/"X86"/"X86;ARM"//' config.toml
+fi
+
 if [ "$SYSTEM_LLVM" = "yes" ] ; then
   cat << EOF >> config.toml
 
@@ -195,7 +203,7 @@ llvm-config = "/usr/bin/llvm-config"
 llvm-config = "/usr/bin/llvm-config"
 EOF
 
-  if [ "$(llvm-config --version)" = "5.0.1" ] ; then
+  if [ "$(llvm-config --version | cut -d. -f1)" -gt 3 ] ; then
     # llvm-config --cflags returns a set of flags including -Wcovered-switch-default
     # and -Wstring-conversion which gcc does not support, breaking the build.
     cat << EOF > local-llvm-config
diff --git a/development/rust/rust.info b/development/rust/rust.info
index bb2204a641..ea5b7adeb6 100644
--- a/development/rust/rust.info
+++ b/development/rust/rust.info
@@ -1,28 +1,28 @@
 PRGNAM="rust"
-VERSION="1.24.1"
+VERSION="1.25.0"
 HOMEPAGE="https://www.rust-lang.org"
-DOWNLOAD="https://static.rust-lang.org/dist/rustc-1.24.1-src.tar.xz \
-          https://static.rust-lang.org/dist/2018-01-04/cargo-0.24.0-i686-unknown-linux-gnu.tar.gz \
-          https://static.rust-lang.org/dist/2018-01-04/rust-std-1.23.0-i686-unknown-linux-gnu.tar.gz \
-          https://static.rust-lang.org/dist/2018-01-04/rustc-1.23.0-i686-unknown-linux-gnu.tar.gz \
-          https://static.rust-lang.org/dist/2018-01-04/cargo-0.24.0-arm-unknown-linux-gnueabi.tar.gz \
-          https://static.rust-lang.org/dist/2018-01-04/rust-std-1.23.0-arm-unknown-linux-gnueabi.tar.gz \
-          https://static.rust-lang.org/dist/2018-01-04/rustc-1.23.0-arm-unknown-linux-gnueabi.tar.gz"
-MD5SUM="1961ffb0a0293e30e5a8fda4f15d2959 \
-        5f149398a682fac3ee88cfa35cc7339a \
-        48507590e56854ab5d2bc672b75568da \
-        d38866fdb43baec3c53d05b37e165b1c \
-        6606bf8fd070e34821fb3bb2dbce561f \
-        1c13d338132e3b3777ec53b340de4761 \
-        9374f161d94606772acaacdb70d81bec"
-DOWNLOAD_x86_64="https://static.rust-lang.org/dist/rustc-1.24.1-src.tar.xz \
-                 https://static.rust-lang.org/dist/2018-01-04/cargo-0.24.0-x86_64-unknown-linux-gnu.tar.gz \
-                 https://static.rust-lang.org/dist/2018-01-04/rust-std-1.23.0-x86_64-unknown-linux-gnu.tar.gz \
-                 https://static.rust-lang.org/dist/2018-01-04/rustc-1.23.0-x86_64-unknown-linux-gnu.tar.gz"
-MD5SUM_x86_64="1961ffb0a0293e30e5a8fda4f15d2959 \
-               830041cfc8627d3f7187954993449cf9 \
-               f9f89caf41e3f9c092118272ceb5bf6b \
-               068fc6566772c4ce165cc547151f514c"
+DOWNLOAD="https://static.rust-lang.org/dist/rustc-1.25.0-src.tar.xz \
+          https://static.rust-lang.org/dist/2018-02-15/cargo-0.25.0-i686-unknown-linux-gnu.tar.gz \
+          https://static.rust-lang.org/dist/2018-02-15/rust-std-1.24.0-i686-unknown-linux-gnu.tar.gz \
+          https://static.rust-lang.org/dist/2018-02-15/rustc-1.24.0-i686-unknown-linux-gnu.tar.gz \
+          https://static.rust-lang.org/dist/2018-02-15/cargo-0.25.0-arm-unknown-linux-gnueabi.tar.gz \
+          https://static.rust-lang.org/dist/2018-02-15/rust-std-1.24.0-arm-unknown-linux-gnueabi.tar.gz \
+          https://static.rust-lang.org/dist/2018-02-15/rustc-1.24.0-arm-unknown-linux-gnueabi.tar.gz"
+MD5SUM="57295a3c3bedfc21e3c643b397a1f017 \
+        b5aff8de6cf43993d6486d7ccc42bf8e \
+        d7e33d9b7226bda2ef68302af86ad503 \
+        c0a641b8dd8e96787169b35c9c1c2903 \
+        86701e7bf219b7ea7647ea35ec5104c7 \
+        4c0633ed46b931820ca09d9ce3e6ec2b \
+        f32f60683990bd3978aa284d69a4f7b9"
+DOWNLOAD_x86_64="https://static.rust-lang.org/dist/rustc-1.25.0-src.tar.xz \
+                 https://static.rust-lang.org/dist/2018-02-15/cargo-0.25.0-x86_64-unknown-linux-gnu.tar.gz \
+                 https://static.rust-lang.org/dist/2018-02-15/rust-std-1.24.0-x86_64-unknown-linux-gnu.tar.gz \
+                 https://static.rust-lang.org/dist/2018-02-15/rustc-1.24.0-x86_64-unknown-linux-gnu.tar.gz"
+MD5SUM_x86_64="57295a3c3bedfc21e3c643b397a1f017 \
+               3563bdec9bc620fcd0bd046424eb78af \
+               2dd480376768d227cd2925ff3c87d685 \
+               2e35e45653015fd85f65e9fc1e2f8270"
 REQUIRES="patchelf"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"