summaryrefslogtreecommitdiffstats
path: root/source/d
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2018-10-27 18:22:46 +0000
committer Eric Hameleers <alien@slackware.com>2018-10-28 09:00:32 +0100
commitff82da05598eac3c4c1e908bf74935310bdfef81 (patch)
treea6132a2f2b73efa6e89751eddd4722a2f0860a8e /source/d
parentfcc8827f1675600216a60e5f6ff14f66b4bd6818 (diff)
downloadcurrent-ff82da05598eac3c4c1e908bf74935310bdfef81.tar.gz
current-ff82da05598eac3c4c1e908bf74935310bdfef81.tar.xz
Sat Oct 27 18:22:46 UTC 201820181027182246
d/rust-1.30.0-x86_64-1.txz: Upgraded. l/gdbm-1.18.1-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_14-x86_64-1.txz: Upgraded. l/mozilla-nss-3.40-x86_64-1.txz: Upgraded. x/libevdev-1.6.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/d')
-rwxr-xr-xsource/d/rust/rust.SlackBuild13
-rw-r--r--source/d/rust/rust.url14
2 files changed, 16 insertions, 11 deletions
diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild
index bc84333be..cfc085ddb 100755
--- a/source/d/rust/rust.SlackBuild
+++ b/source/d/rust/rust.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=rust
SRCNAM="${PKGNAM}c"
-VERSION=${VERSION:-1.29.2}
+VERSION=${VERSION:-1.30.0}
BUILD=${BUILD:-1}
# Set this to YES to build with the system LLVM, or NO to use the bundled LLVM.
@@ -34,9 +34,9 @@ BUILD=${BUILD:-1}
SYSTEM_LLVM=${SYSTEM_LLVM:-NO}
# Bootstrap variables (might not be kept updated for latest Rust):
-RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.28.0}
-RSTAGE0_DIR=${RSTAGE0_DIR:-2018-08-02}
-CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.29.0}
+RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.29.2}
+RSTAGE0_DIR=${RSTAGE0_DIR:-2018-10-12}
+CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.30.0}
CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR}
# Automatically determine the architecture we're building on:
@@ -52,6 +52,11 @@ if [ -z "$ARCH" ]; then
fi
unset MARCH
+# For compiling i686 under an x86_64 kernel:
+if [ "$(uname -m)" = "x86_64" -a "$(file -L /usr/bin/gcc | grep 80386 | grep 32-bit)" != "" ]; then
+ ARCH=i686
+fi
+
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
# the name of the created package would be, and then exit. This information
# could be useful to other scripts.
diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url
index c4ac64ad2..c6e448fe9 100644
--- a/source/d/rust/rust.url
+++ b/source/d/rust/rust.url
@@ -1,5 +1,5 @@
# Source code (repacked to .tar.xz):
-lftpget https://static.rust-lang.org/dist/rustc-1.29.2-src.tar.gz
+lftpget https://static.rust-lang.org/dist/rustc-1.30.0-src.tar.gz
gzip -d rustc-*tar.gz
plzip -9 -v rustc-*tar
@@ -12,12 +12,12 @@ plzip -9 -v rustc-*tar
exit 0
# i686 bootstrap:
-lftpget https://static.rust-lang.org/dist/2018-08-02/cargo-0.29.0-i686-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/2018-08-02/rust-std-1.28.0-i686-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/2018-08-02/rustc-1.28.0-i686-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2018-10-12/cargo-0.30.0-i686-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2018-10-12/rust-std-1.29.2-i686-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2018-10-12/rustc-1.29.2-i686-unknown-linux-gnu.tar.gz
# x86_64 bootstrap:
-lftpget https://static.rust-lang.org/dist/2018-08-02/cargo-0.29.0-x86_64-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/2018-08-02/rust-std-1.28.0-x86_64-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/2018-08-02/rustc-1.28.0-x86_64-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2018-10-12/cargo-0.30.0-x86_64-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2018-10-12/rust-std-1.29.2-x86_64-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2018-10-12/rustc-1.29.2-x86_64-unknown-linux-gnu.tar.gz