development/rust: Updated for version 1.24.0.

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

2 files changed, 28 insertions, 33 deletions

diff --git a/development/rust/rust.SlackBuild b/development/rust/rust.SlackBuild
index b4f358882e..c85c808a99 100644
--- a/development/rust/rust.SlackBuild
+++ b/development/rust/rust.SlackBuild
@@ -26,12 +26,12 @@
 
 PRGNAM=rust
 SRCNAM="${PRGNAM}c"
-VERSION=${VERSION:-1.23.0}
+VERSION=${VERSION:-1.24.0}
 
 # src/stage0.txt
-RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.22.0}
-RSTAGE0_DIR=${RSTAGE0_DIR:-2017-11-20}
-CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.23.0}
+RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.23.0}
+RSTAGE0_DIR=${RSTAGE0_DIR:-2018-01-04}
+CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.24.0}
 CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR}
 
 BUILD=${BUILD:-1}
@@ -86,7 +86,6 @@ elif [ "$ARCH" = "arm" ]; then
   fi
 
   # there is tier3 support for armv5te, but it ftbfs for me
-  # https://github.com/rust-lang-nursery/compiler-builtins/pull/115
   TARCH="$BARCH"
 else
   BARCH="$ARCH"
@@ -147,7 +146,7 @@ fi
 # needed during the build, and then we'll strip the rpaths out of the
 # binaries later.
 
-# LLVM in Slackware14.2 is now too old to build rust 1.23.0, so the rust build
+# LLVM in Slackware14.2 is now too old to build rust 1.24.0, so the rust build
 # falls back to building its own
 cat << EOF > config.toml
 [build]
@@ -205,10 +204,6 @@ fi
 if [ "$ARCH" = "arm" ] ; then
   python x.py dist
 else
-  # README.md says gcc 4.7 / clang 3.x or later needed
-  # but building fails for me with GCC 5.3 from slackware 14.2
-  CC=clang \
-  CXX=clang++ \
   CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
   python x.py dist
diff --git a/development/rust/rust.info b/development/rust/rust.info
index 3905cfa326..881c456a92 100644
--- a/development/rust/rust.info
+++ b/development/rust/rust.info
@@ -1,28 +1,28 @@
 PRGNAM="rust"
-VERSION="1.23.0"
+VERSION="1.24.0"
 HOMEPAGE="https://www.rust-lang.org"
-DOWNLOAD="https://dev-static.rust-lang.org/dist/rustc-1.23.0-src.tar.xz \
-          https://dev-static.rust-lang.org/dist/2017-11-20/cargo-0.23.0-i686-unknown-linux-gnu.tar.gz \
-          https://dev-static.rust-lang.org/dist/2017-11-20/rust-std-1.22.0-i686-unknown-linux-gnu.tar.gz \
-          https://dev-static.rust-lang.org/dist/2017-11-20/rustc-1.22.0-i686-unknown-linux-gnu.tar.gz \
-          https://dev-static.rust-lang.org/dist/2017-11-20/cargo-0.23.0-arm-unknown-linux-gnueabi.tar.gz \
-          https://dev-static.rust-lang.org/dist/2017-11-20/rust-std-1.22.0-arm-unknown-linux-gnueabi.tar.gz \
-          https://dev-static.rust-lang.org/dist/2017-11-20/rustc-1.22.0-arm-unknown-linux-gnueabi.tar.gz"
-MD5SUM="6efb8285f44db7dc455ca4f20a15b452 \
-        0e836c30e09f1d62ee223c0f3213df99 \
-        c55b1026589fad124ecc688c04776482 \
-        0b9247b46071b2eab341e1a44a0bfa80 \
-        f6e6d8917e33cf8781ad2a305e7077ac \
-        a329b9912aecdabb1d9f2bb781ad0d71 \
-        61a976a4d5f087e7c232d7f5b2827413"
-DOWNLOAD_x86_64="https://dev-static.rust-lang.org/dist/rustc-1.23.0-src.tar.xz \
-                 https://dev-static.rust-lang.org/dist/2017-11-20/cargo-0.23.0-x86_64-unknown-linux-gnu.tar.gz \
-                 https://dev-static.rust-lang.org/dist/2017-11-20/rust-std-1.22.0-x86_64-unknown-linux-gnu.tar.gz \
-                 https://dev-static.rust-lang.org/dist/2017-11-20/rustc-1.22.0-x86_64-unknown-linux-gnu.tar.gz"
-MD5SUM_x86_64="6efb8285f44db7dc455ca4f20a15b452 \
-               0944b36bc9a7172e72c8012dcf2d78f6 \
-               cec6c782c96fc3aaf2805aee282da8cf \
-               22ba09f279f862ad5d5712ef8e81ebe5"
+DOWNLOAD="https://static.rust-lang.org/dist/rustc-1.24.0-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="1203b1273e329f5190b5b06706687c26 \
+        5f149398a682fac3ee88cfa35cc7339a \
+        48507590e56854ab5d2bc672b75568da \
+        d38866fdb43baec3c53d05b37e165b1c \
+        6606bf8fd070e34821fb3bb2dbce561f \
+        1c13d338132e3b3777ec53b340de4761 \
+        9374f161d94606772acaacdb70d81bec"
+DOWNLOAD_x86_64="https://static.rust-lang.org/dist/rustc-1.24.0-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="1203b1273e329f5190b5b06706687c26 \
+               830041cfc8627d3f7187954993449cf9 \
+               f9f89caf41e3f9c092118272ceb5bf6b \
+               068fc6566772c4ce165cc547151f514c"
 REQUIRES="patchelf"
 MAINTAINER="Andrew Clemons"
 EMAIL="andrew.clemons@gmail.com"