From 99b4aa02463de6d0f94e40d10b4686e638894a89 Mon Sep 17 00:00:00 2001
From: Andrew Clemons <andrew.clemons@gmail.com>
Date: Fri, 5 Jan 2018 14:14:10 +0000
Subject: development/rust: Updated for version 1.23.0.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 development/rust/rust.SlackBuild | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

(limited to 'development/rust/rust.SlackBuild')

diff --git a/development/rust/rust.SlackBuild b/development/rust/rust.SlackBuild
index b5ebce4d8162f..b4f358882e3c5 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
-- 
cgit v1.2.3