summaryrefslogtreecommitdiffstats
path: root/source/d
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-11-20 02:37:23 +0000
committer Eric Hameleers <alien@slackware.com>2020-11-20 08:59:52 +0100
commit91d64759d25ea2310456c5bbab06d8a4aa111cb4 (patch)
tree4c83f0961e39aaa92b52bc3493bf5c62c8080866 /source/d
parentf6a74b16d215620be5ccee5d1d8154214d3d209a (diff)
downloadcurrent-20201120023723.tar.gz
current-20201120023723.tar.xz
Fri Nov 20 02:37:23 UTC 202020201120023723
a/kernel-firmware-20201119_54c797a-noarch-1.txz: Upgraded. a/tcsh-6.22.03-x86_64-1.txz: Upgraded. d/automake-1.16.3-noarch-1.txz: Upgraded. d/rust-1.48.0-x86_64-1.txz: Upgraded. l/libcap-ng-0.8.1-x86_64-1.txz: Upgraded. n/libksba-1.5.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/d')
-rw-r--r--source/d/rust/link_libffi.diff7
-rwxr-xr-xsource/d/rust/rust.SlackBuild10
-rw-r--r--source/d/rust/rust.url14
3 files changed, 15 insertions, 16 deletions
diff --git a/source/d/rust/link_libffi.diff b/source/d/rust/link_libffi.diff
index 38e0113e..dd5a3e0f 100644
--- a/source/d/rust/link_libffi.diff
+++ b/source/d/rust/link_libffi.diff
@@ -1,7 +1,6 @@
-diff -Naur rustc-1.21.0-src.bak/src/librustc_llvm/build.rs rustc-1.21.0-src/src/librustc_llvm/build.rs
---- rustc-1.21.0-src.bak/src/librustc_llvm/build.rs 2017-10-10 09:04:51.000000000 +1300
-+++ rustc-1.21.0-src/src/librustc_llvm/build.rs 2017-10-14 15:28:56.761081727 +1300
-@@ -221,6 +221,8 @@
+--- ./compiler/rustc_llvm/build.rs.orig 2020-11-16 08:01:53.000000000 -0600
++++ ./compiler/rustc_llvm/build.rs 2020-11-19 13:46:21.222785372 -0600
+@@ -234,6 +234,8 @@
println!("cargo:rustc-link-lib={}={}", kind, name);
}
diff --git a/source/d/rust/rust.SlackBuild b/source/d/rust/rust.SlackBuild
index 6e8e6af1..6c3aa640 100755
--- a/source/d/rust/rust.SlackBuild
+++ b/source/d/rust/rust.SlackBuild
@@ -26,17 +26,17 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=rust
SRCNAM="${PKGNAM}c"
-VERSION=${VERSION:-1.47.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-1.48.0}
+BUILD=${BUILD:-1}
# Set this to YES to build with the system LLVM, or NO to use the bundled LLVM.
# YES is probably better (when it works...)
SYSTEM_LLVM=${SYSTEM_LLVM:-YES}
# Bootstrap variables (might not be kept updated for latest Rust):
-RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.46.0}
-RSTAGE0_DIR=${RSTAGE0_DIR:-2020-08-27}
-CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.47.0}
+RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.47.0}
+RSTAGE0_DIR=${RSTAGE0_DIR:-2020-10-08}
+CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.48.0}
CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR}
# Automatically determine the architecture we're building on:
diff --git a/source/d/rust/rust.url b/source/d/rust/rust.url
index c9982da0..5c5e8f14 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.47.0
+VERSION=1.48.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
@@ -21,12 +21,12 @@ fi
exit 0
# i686 bootstrap:
-lftpget https://static.rust-lang.org/dist/2020-08-27/cargo-0.47.0-i686-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/2020-08-27/rust-std-1.46.0-i686-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/2020-08-27/rustc-1.46.0-i686-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2020-10-08/cargo-0.48.0-i686-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2020-10-08/rust-std-1.47.0-i686-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2020-10-08/rustc-1.47.0-i686-unknown-linux-gnu.tar.gz
# x86_64 bootstrap:
-lftpget https://static.rust-lang.org/dist/2020-08-27/cargo-0.47.0-x86_64-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/2020-08-27/rust-std-1.46.0-x86_64-unknown-linux-gnu.tar.gz
-lftpget https://static.rust-lang.org/dist/2020-08-27/rustc-1.46.0-x86_64-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2020-10-08/cargo-0.48.0-x86_64-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2020-10-08/rust-std-1.47.0-x86_64-unknown-linux-gnu.tar.gz
+lftpget https://static.rust-lang.org/dist/2020-10-08/rustc-1.47.0-x86_64-unknown-linux-gnu.tar.gz