summaryrefslogtreecommitdiff
path: root/source/d/rust
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-06-18 20:33:08 +0000
committerEric Hameleers <alien@slackware.com>2021-06-19 02:59:56 +0200
commitd982348571d80dbef6cd54f4af963ffe8237b9a9 (patch)
tree8b84c61e396b2989872537d0e3b0ee7f5d683a5f /source/d/rust
parent485160d3b1290e06e312141561f1f64c7ed64040 (diff)
downloadcurrent-d982348571d80dbef6cd54f4af963ffe8237b9a9.tar.gz
Fri Jun 18 20:33:08 UTC 202120210618203308
a/kernel-generic-5.12.12-x86_64-1.txz: Upgraded. a/kernel-huge-5.12.12-x86_64-1.txz: Upgraded. a/kernel-modules-5.12.12-x86_64-1.txz: Upgraded. a/upower-0.99.12-x86_64-1.txz: Upgraded. d/kernel-headers-5.12.12-x86-1.txz: Upgraded. d/rust-1.53.0-x86_64-1.txz: Upgraded. k/kernel-source-5.12.12-noarch-1.txz: Upgraded. kde/kdeconnect-kde-21.04.2-x86_64-2.txz: Rebuilt. Recompiled against pulseaudio-qt-1.3. l/gdbm-1.20-x86_64-1.txz: Upgraded. n/bind-9.16.18-x86_64-1.txz: Upgraded. n/openvpn-2.5.3-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/d/rust')
-rwxr-xr-xsource/d/rust/rust.SlackBuild30
-rw-r--r--source/d/rust/rust.url20
2 files changed, 25 insertions, 25 deletions
diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild
index 99b86d08..a20ba1e8 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.52.1}
+VERSION=${VERSION:-1.53.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:-YES}
# Bootstrap variables (might not be kept updated for latest Rust):
-RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.51.0}
-RSTAGE0_DIR=${RSTAGE0_DIR:-2021-03-25}
-CSTAGE0_VERSION=${CSTAGE0_VERSION:-1.51.0}
+RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.52.0}
+RSTAGE0_DIR=${RSTAGE0_DIR:-2021-05-06}
+CSTAGE0_VERSION=${CSTAGE0_VERSION:-1.52.0}
CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR}
# Automatically determine the architecture we're building on:
@@ -67,7 +67,7 @@ fi
# If the bootstrap binaries are present, use those. Otherwise bootstrap from
# installed compiler.
-if /bin/ls *-unknown-linux-gnu.tar.gz 1> /dev/null 2> /dev/null ; then
+if /bin/ls *-unknown-linux-gnu.tar.?z 1> /dev/null 2> /dev/null ; then
LOCAL_BOOTSTRAP=no
else
LOCAL_BOOTSTRAP=yes
@@ -153,9 +153,7 @@ if [ "$LOCAL_BOOTSTRAP" != "yes" ] ; then
cp $CWD/cargo-$CSTAGE0_VERSION-$BARCH-unknown-linux-gnu.tar.?z build/cache/$CSTAGE0_DIR
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.
+# Build configuration:
cat << EOF > config.toml
[llvm]
ccache = "/usr/bin/ccache"
@@ -165,6 +163,7 @@ link-shared = true
build = "$BARCH-unknown-linux-$BABI"
host = ["$TARCH-unknown-linux-$BABI"]
target = ["$TARCH-unknown-linux-$BABI"]
+tools = ["analysis", "cargo", "clippy", "rls", "rustfmt", "src"]
submodules = false
vendor = true
extended = true
@@ -178,7 +177,7 @@ mandir = "man"
[rust]
codegen-units = 0
channel = "stable"
-rpath = true
+rpath = false
codegen-tests = false
ignore-git = true
@@ -232,7 +231,7 @@ elif [ "$BARCH" = "i686" ] ; then
fi
# Build and install:
-python3 x.py dist || exit 1
+python3 ./x.py build || exit 1
DESTDIR=$PKG python3 x.py install || exit 1
# Eh, none of this is all that big. Might as well leave it around as a
@@ -258,11 +257,12 @@ find $PKG/usr/lib$LIBDIRSUFFIX -name "*.so" -exec chmod 755 "{}" \+
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-# Remove any compiled-in RPATHs:
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
- | cut -f 1 -d : | while read elfobject ; do
- patchelf --remove-rpath $elfobject || exit 1
-done
+# Commented out (for now) since we disable rpaths in config.toml:
+## Remove any compiled-in RPATHs:
+#find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
+# | cut -f 1 -d : | while read elfobject ; do
+# patchelf --remove-rpath $elfobject || exit 1
+#done
# Compress man pages:
find $PKG/usr/man -type f -exec gzip -9 {} \+
diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url
index b77baf64..02715759 100644
--- a/source/d/rust/rust.url
+++ b/source/d/rust/rust.url
@@ -1,5 +1,5 @@
# Source code (repacked to .tar.lz):
-VERSION=1.52.1
+VERSION=1.53.0
rm -f rustc-${VERSION}-src.tar.*
lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz
lftpget https://static.rust-lang.org/dist/rustc-${VERSION}-src.tar.gz.asc
@@ -20,16 +20,16 @@ fi
# update the settings below, look at src/stage0.txt in the Rust sources.
exit 0
-BOOTSTRAP_DATE=2021-03-25
-BOOTSTRAP_CARGO=1.51.0
-BOOTSTRAP_VERSION=1.51.0
+BOOTSTRAP_DATE=2021-05-06
+BOOTSTRAP_CARGO=1.52.0
+BOOTSTRAP_VERSION=1.52.0
# i686 bootstrap:
-lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/cargo-${BOOTSTRAP_CARGO}-i686-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rust-std-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rustc-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/cargo-${BOOTSTRAP_CARGO}-i686-unknown-linux-gnu.tar.xz
+lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rust-std-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.xz
+lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rustc-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.xz
# x86_64 bootstrap:
-lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/cargo-${BOOTSTRAP_CARGO}-x86_64-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rust-std-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rustc-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/cargo-${BOOTSTRAP_CARGO}-x86_64-unknown-linux-gnu.tar.xz
+lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rust-std-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.xz
+lftpget https://static.rust-lang.org/dist/${BOOTSTRAP_DATE}/rustc-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.xz