summaryrefslogtreecommitdiffstats
path: root/development
diff options
context:
space:
mode:
author Andrew Clemons <andrew.clemons@gmail.com>2018-01-05 14:14:10 +0000
committer Willy Sudiarto Raharjo <willysr@slackbuilds.org>2018-01-06 06:55:30 +0700
commit99b4aa02463de6d0f94e40d10b4686e638894a89 (patch)
tree04af683292f0ca1dafebcbe72ab8790ac1bb01d9 /development
parenta90a702bc8e951ea0a884243a53469c789025617 (diff)
downloadslackbuilds-99b4aa02463de6d0f94e40d10b4686e638894a89.tar.gz
slackbuilds-99b4aa02463de6d0f94e40d10b4686e638894a89.tar.xz
development/rust: Updated for version 1.23.0.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'development')
-rw-r--r--development/rust/link_libffi.diff.gzbin300 -> 0 bytes
-rw-r--r--development/rust/rust.SlackBuild28
-rw-r--r--development/rust/rust.info46
3 files changed, 31 insertions, 43 deletions
diff --git a/development/rust/link_libffi.diff.gz b/development/rust/link_libffi.diff.gz
deleted file mode 100644
index 0469634292..0000000000
--- a/development/rust/link_libffi.diff.gz
+++ /dev/null
Binary files differ
diff --git a/development/rust/rust.SlackBuild b/development/rust/rust.SlackBuild
index b5ebce4d81..b4f358882e 100644
--- a/development/rust/rust.SlackBuild
+++ b/development/rust/rust.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for rust
-# Copyright 2017 Andrew Clemons, Wellington, New Zealand
+# Copyright 2017-2018 Andrew Clemons, Wellington, New Zealand
# Copyright 2017 Patrick J. Volkerding, Sebeka, Minnesota, USA
# Copyright 2017 Stuart Winter
# All rights reserved.
@@ -26,12 +26,12 @@
PRGNAM=rust
SRCNAM="${PRGNAM}c"
-VERSION=${VERSION:-1.22.1}
+VERSION=${VERSION:-1.23.0}
# src/stage0.txt
-RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.21.0}
-RSTAGE0_DIR=${RSTAGE0_DIR:-2017-10-12}
-CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.22.0}
+RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.22.0}
+RSTAGE0_DIR=${RSTAGE0_DIR:-2017-11-20}
+CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.23.0}
CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR}
BUILD=${BUILD:-1}
@@ -131,9 +131,6 @@ rm -rf $SRCNAM-$VERSION-src
tar xvf $CWD/$SRCNAM-$VERSION-src.tar.xz
cd $SRCNAM-$VERSION-src
-# Link with -lffi in case of using system LLVM:
-zcat $CWD/link_libffi.diff.gz | patch -p1 --verbose
-
if [ "$LOCAL_BOOTSTRAP" != "yes" ] ; then
# rust requires bootstrapping with the previous rust version.
# versions are defined in src/stage0.txt.
@@ -149,6 +146,9 @@ fi
# Build configuration. We'll go ahead and build with rpath because it may be
# 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
+# falls back to building its own
cat << EOF > config.toml
[build]
build = "$BARCH-unknown-linux-$BABI"
@@ -170,18 +170,6 @@ channel = "stable"
rpath = true
codegen-tests = false
ignore-git = true
-
-[target.i586-unknown-linux-gnu]
-llvm-config = "/usr/bin/llvm-config"
-
-[target.i686-unknown-linux-gnu]
-llvm-config = "/usr/bin/llvm-config"
-
-[target.x86_64-unknown-linux-gnu]
-llvm-config = "/usr/bin/llvm-config"
-
-[target.arm-unknown-linux-gnueabi]
-llvm-config = "/usr/bin/llvm-config"
EOF
if [ "$LOCAL_BOOTSTRAP" = "yes" ] ; then
diff --git a/development/rust/rust.info b/development/rust/rust.info
index 38e72d0508..3905cfa326 100644
--- a/development/rust/rust.info
+++ b/development/rust/rust.info
@@ -1,28 +1,28 @@
PRGNAM="rust"
-VERSION="1.22.1"
+VERSION="1.23.0"
HOMEPAGE="https://www.rust-lang.org"
-DOWNLOAD="https://static.rust-lang.org/dist/rustc-1.22.1-src.tar.xz \
- https://static.rust-lang.org/dist/2017-10-12/cargo-0.22.0-i686-unknown-linux-gnu.tar.gz \
- https://static.rust-lang.org/dist/2017-10-12/rust-std-1.21.0-i686-unknown-linux-gnu.tar.gz \
- https://static.rust-lang.org/dist/2017-10-12/rustc-1.21.0-i686-unknown-linux-gnu.tar.gz \
- https://static.rust-lang.org/dist/2017-10-12/cargo-0.22.0-arm-unknown-linux-gnueabi.tar.gz \
- https://static.rust-lang.org/dist/2017-10-12/rust-std-1.21.0-arm-unknown-linux-gnueabi.tar.gz \
- https://static.rust-lang.org/dist/2017-10-12/rustc-1.21.0-arm-unknown-linux-gnueabi.tar.gz"
-MD5SUM="210472cdde0d83962ba06419f2a7ce54 \
- 5d9f7b60e2e2b7c1aa29d84ea7ebb64d \
- d97d2b6720c9a06ac369668d9c2f496f \
- c3d3d0147c720c51b0bf54d7984e4fa7 \
- b481b8d8cc29d5ceeda6be2acad1cce5 \
- e55cf673cb5dc76c099fd4a80377bc77 \
- b017d543b9ec539d7df7383c97cc6522"
-DOWNLOAD_x86_64="https://static.rust-lang.org/dist/rustc-1.22.1-src.tar.xz \
- https://static.rust-lang.org/dist/2017-10-12/cargo-0.22.0-x86_64-unknown-linux-gnu.tar.gz \
- https://static.rust-lang.org/dist/2017-10-12/rust-std-1.21.0-x86_64-unknown-linux-gnu.tar.gz \
- https://static.rust-lang.org/dist/2017-10-12/rustc-1.21.0-x86_64-unknown-linux-gnu.tar.gz"
-MD5SUM_x86_64="210472cdde0d83962ba06419f2a7ce54 \
- b870d85feb8958727dbdad476007d65c \
- b6e348e588a789eca369b5404e7d7656 \
- 6b5b084cb997d20d11b7b2b566ffccdd"
+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"
REQUIRES="patchelf"
MAINTAINER="Andrew Clemons"
EMAIL="andrew.clemons@gmail.com"