aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--development/rust/README.SLACKWARE5
-rw-r--r--development/rust/rust.SlackBuild17
-rw-r--r--development/rust/rust.info46
3 files changed, 38 insertions, 30 deletions
diff --git a/development/rust/README.SLACKWARE b/development/rust/README.SLACKWARE
index 86a0449d9263c..b4a56e392aa9e 100644
--- a/development/rust/README.SLACKWARE
+++ b/development/rust/README.SLACKWARE
@@ -16,8 +16,8 @@ Here is a rough guide to bootstrap rust completely from source:
* Build and install mrustc (from slackbuilds.org). You now have a fully
functional rust 1.19.0.
-* Now build for rust 1.20.0, 1.21.0, 1.22.1, 1.23.0, 1.24.1, 1.25.0, and finally
- 1.26.2.
+* Now build for rust 1.20.0, 1.21.0, 1.22.1, 1.23.0, 1.24.1, 1.25.0, 1.26.2
+ and finally 1.27.2.
This slackbuild is currently compatible with each of those versions.
Since we are building completely from source, you only need the source
@@ -33,6 +33,7 @@ Example:
VERSION=1.24.1 FULL_BOOTSTRAP=no LOCAL_BOOTSTRAP=yes ./rust.SlackBuild
VERSION=1.25.0 FULL_BOOTSTRAP=no LOCAL_BOOTSTRAP=yes ./rust.SlackBuild
VERSION=1.26.2 FULL_BOOTSTRAP=no LOCAL_BOOTSTRAP=yes ./rust.SlackBuild
+ VERSION=1.27.2 FULL_BOOTSTRAP=no LOCAL_BOOTSTRAP=yes ./rust.SlackBuild
You might prefer to do a full bootstrap for 1.20.0, which is what mrustc's own
bootstrap script suggests. The versions after that do not need a full bootstrap.
diff --git a/development/rust/rust.SlackBuild b/development/rust/rust.SlackBuild
index f7c8ad00ee221..98b0387c46ccf 100644
--- a/development/rust/rust.SlackBuild
+++ b/development/rust/rust.SlackBuild
@@ -26,20 +26,20 @@
PRGNAM=rust
SRCNAM="${PRGNAM}c"
-VERSION=${VERSION:-1.26.2}
+VERSION=${VERSION:-1.27.2}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
# Set this to YES to build with the system LLVM, or NO to use the bundled LLVM.
# YES is probably better (when it works...)
-# LLVM in Slackware14.2 is now too old to build rust 1.26.0
+# LLVM in Slackware14.2 is now too old to build rust 1.27.2
SYSTEM_LLVM=${SYSTEM_LLVM:-NO}
SYSTEM_LLVM=$(echo "$SYSTEM_LLVM" | tr '[:lower:]' '[:upper:]')
# Bootstrap variables (might not be kept updated for latest Rust):
-RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.25.0}
-RSTAGE0_DIR=${RSTAGE0_DIR:-2018-03-29}
-CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.26.0}
+RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.26.0}
+RSTAGE0_DIR=${RSTAGE0_DIR:-2018-05-10}
+CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.27.0}
CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR}
if [ -z "$ARCH" ]; then
@@ -192,6 +192,13 @@ if [ "$ARCH" = "arm" ] ; then
sed -i 's/"X86"/"X86;ARM"//' config.toml
fi
+if case "$ARCH" in i?86) true ;; *) false ;; esac && [ "$(echo "$VERSION" | cut -d. -f 1)" -eq 1 ] && [ "$(echo "$VERSION" | cut -d. -f 2)" -ge 27 ] ; then
+ # building rust on 32bit is now failing with (signal: 11, SIGSEGV: invalid memory reference)
+ # or sometimes LLVM ERROR: out of memory.
+ # maybe using fewer codegen-units seems to help
+ sed -i 's/codegen-units = 0/codegen-units = 1/' config.toml
+fi
+
if [ "${SYSTEM_LLVM}" = "YES" ]; then
cat << EOF >> config.toml
# Add this stuff to build with the system LLVM:
diff --git a/development/rust/rust.info b/development/rust/rust.info
index d51965d6ba97b..c1231975de6e7 100644
--- a/development/rust/rust.info
+++ b/development/rust/rust.info
@@ -1,28 +1,28 @@
PRGNAM="rust"
-VERSION="1.26.2"
+VERSION="1.27.2"
HOMEPAGE="https://www.rust-lang.org"
-DOWNLOAD="https://static.rust-lang.org/dist/rustc-1.26.2-src.tar.xz \
- https://static.rust-lang.org/dist/2018-03-29/cargo-0.26.0-i686-unknown-linux-gnu.tar.gz \
- https://static.rust-lang.org/dist/2018-03-29/rust-std-1.25.0-i686-unknown-linux-gnu.tar.gz \
- https://static.rust-lang.org/dist/2018-03-29/rustc-1.25.0-i686-unknown-linux-gnu.tar.gz \
- https://static.rust-lang.org/dist/2018-03-29/cargo-0.26.0-arm-unknown-linux-gnueabi.tar.gz \
- https://static.rust-lang.org/dist/2018-03-29/rust-std-1.25.0-arm-unknown-linux-gnueabi.tar.gz \
- https://static.rust-lang.org/dist/2018-03-29/rustc-1.25.0-arm-unknown-linux-gnueabi.tar.gz"
-MD5SUM="5185c661cab0d34121e78a2a5c28af5f \
- d49b79a5425ea14c0f54d8d4abe48cc7 \
- 5f248be4a20a53419d0bf5c5120ebe04 \
- d6c7c406e1a783b174aaf1414e9f0900 \
- 4fe96e55897f156fdbc80c96a0913516 \
- 3e1a27b11f17428290a6133a1b0211c8 \
- 5f277935c04a431fb64bbac160d53118"
-DOWNLOAD_x86_64="https://static.rust-lang.org/dist/rustc-1.26.2-src.tar.xz \
- https://static.rust-lang.org/dist/2018-03-29/cargo-0.26.0-x86_64-unknown-linux-gnu.tar.gz \
- https://static.rust-lang.org/dist/2018-03-29/rust-std-1.25.0-x86_64-unknown-linux-gnu.tar.gz \
- https://static.rust-lang.org/dist/2018-03-29/rustc-1.25.0-x86_64-unknown-linux-gnu.tar.gz"
-MD5SUM_x86_64="5185c661cab0d34121e78a2a5c28af5f \
- b0de62d86f0ba71078471d09916873c6 \
- 37e9f9193413caba47134af3306328c5 \
- 6e9c8ae2946cf6626ad6511c7a1d6c2a"
+DOWNLOAD="https://static.rust-lang.org/dist/rustc-1.27.2-src.tar.xz \
+ https://static.rust-lang.org/dist/2018-05-10/cargo-0.27.0-i686-unknown-linux-gnu.tar.gz \
+ https://static.rust-lang.org/dist/2018-05-10/rust-std-1.26.0-i686-unknown-linux-gnu.tar.gz \
+ https://static.rust-lang.org/dist/2018-05-10/rustc-1.26.0-i686-unknown-linux-gnu.tar.gz \
+ https://static.rust-lang.org/dist/2018-05-10/cargo-0.27.0-arm-unknown-linux-gnueabi.tar.gz \
+ https://static.rust-lang.org/dist/2018-05-10/rust-std-1.26.0-arm-unknown-linux-gnueabi.tar.gz \
+ https://static.rust-lang.org/dist/2018-05-10/rustc-1.26.0-arm-unknown-linux-gnueabi.tar.gz"
+MD5SUM="0cd18cb0afe88df0d24c6e16f81f4d53 \
+ 109f6dc05eda54bb18a45e86a7eb2f0b \
+ a8dfbaf8e75f8afe4d989ccd1bf3cedf \
+ f81c2288a93d47484375b424a0995d2a \
+ f62733feed24cbf59ebc2161c74d9207 \
+ 1a49ec9bb275c57a7f9fe4a770869e13 \
+ 4bc1372aa07d4e133ca406d4d0952f09"
+DOWNLOAD_x86_64="https://static.rust-lang.org/dist/rustc-1.27.2-src.tar.xz \
+ https://static.rust-lang.org/dist/2018-05-10/cargo-0.27.0-x86_64-unknown-linux-gnu.tar.gz \
+ https://static.rust-lang.org/dist/2018-05-10/rust-std-1.26.0-x86_64-unknown-linux-gnu.tar.gz \
+ https://static.rust-lang.org/dist/2018-05-10/rustc-1.26.0-x86_64-unknown-linux-gnu.tar.gz"
+MD5SUM_x86_64="0cd18cb0afe88df0d24c6e16f81f4d53 \
+ 9dd47b2e02a639e0879c3293eb8c7fc0 \
+ 643460e582de498eea53ec1e93aeabab \
+ 939631f19dd9ca5ae8493dc8ec2d3131"
REQUIRES="patchelf"
MAINTAINER="Andrew Clemons"
EMAIL="andrew.clemons@gmail.com"