From cdea680437e2afe627210ed696c16969e268ad84 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Fri, 8 Nov 2019 23:23:40 +0000 Subject: Fri Nov 8 23:23:40 UTC 2019 a/hostname-3.23-x86_64-1.txz: Upgraded. a/kernel-firmware-20191108_f1100dd-noarch-1.txz: Upgraded. ap/mariadb-10.4.10-x86_64-1.txz: Upgraded. kde/kdelibs-4.14.38-x86_64-5.txz: Rebuilt. Remove hardcoded TLSv1 allowing TLSv1.1 and TLSv1.2. Thanks to PJ Beers. kde/kdepim-4.14.10-x86_64-5.txz: Rebuilt. Remove hardcoded TLSv1 allowing TLSv1.1 and TLSv1.2. Thanks to PJ Beers. kde/kdepimlibs-4.14.10-x86_64-9.txz: Rebuilt. Remove hardcoded TLSv1 allowing TLSv1.1 and TLSv1.2. Thanks to PJ Beers. l/adwaita-icon-theme-3.34.3-noarch-1.txz: Upgraded. testing/packages/rust-1.39.0-x86_64-1.txz: Upgraded. --- .../0001-WIP-minimize-the-rust-std-component.patch | 31 +++++----------------- testing/source/rust/hack.diff | 29 ++++++++++++++++++++ testing/source/rust/rust.SlackBuild | 11 ++++---- testing/source/rust/rust.url | 14 +++++----- 4 files changed, 48 insertions(+), 37 deletions(-) create mode 100644 testing/source/rust/hack.diff (limited to 'testing') diff --git a/testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch b/testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch index 04be717a3..e46a7265c 100644 --- a/testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch +++ b/testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch @@ -1,17 +1,6 @@ -From 2bf05f208272cd58c57f4d7d8d0e10fdb22e8719 Mon Sep 17 00:00:00 2001 -From: Josh Stone -Date: Fri, 27 Sep 2019 12:33:08 -0700 -Subject: [PATCH] [WIP] minimize the rust-std component - ---- - src/bootstrap/dist.rs | 45 +++++++++++++++---------------------------- - 1 file changed, 16 insertions(+), 29 deletions(-) - -diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs -index 552965863d10..76fbd07f9fb5 100644 ---- a/src/bootstrap/dist.rs -+++ b/src/bootstrap/dist.rs -@@ -667,41 +667,28 @@ impl Step for Std { +--- ./src/bootstrap/dist.rs.orig 2019-11-07 16:25:16.099477103 -0600 ++++ ./src/bootstrap/dist.rs 2019-11-07 16:31:36.510445625 -0600 +@@ -675,36 +675,28 @@ return distdir(builder).join(format!("{}-{}.tar.gz", name, target)); } @@ -21,15 +10,10 @@ index 552965863d10..76fbd07f9fb5 100644 - if builder.hosts.iter().any(|t| t == target) { - builder.ensure(compile::Rustc { compiler, target }); - } else { -- if builder.no_std(target) == Some(true) { -- // the `test` doesn't compile for no-std targets -- builder.ensure(compile::Std { compiler, target }); -- } else { -- builder.ensure(compile::Test { compiler, target }); -- } +- builder.ensure(compile::Std { compiler, target }); - } + builder.ensure(compile::Std { compiler, target }); -+ builder.ensure(compile::Test { compiler, target }); ++ builder.ensure(compile::Rustc { compiler, target }); let image = tmpdir(builder).join(format!("{}-{}-image", name, target)); let _ = fs::remove_dir_all(&image); @@ -60,7 +44,7 @@ index 552965863d10..76fbd07f9fb5 100644 - true - }); + } -+ let stamp = dbg!(compile::libtest_stamp(builder, compiler_to_use, target)); ++ let stamp = dbg!(compile::librustc_stamp(builder, compiler_to_use, target)); + for (path, host) in builder.read_stamp_file(&stamp) { + if !host { + builder.copy(&path, &dst.join(path.file_name().unwrap())); @@ -69,6 +53,3 @@ index 552965863d10..76fbd07f9fb5 100644 let mut cmd = rust_installer(builder); cmd.arg("generate") --- -2.21.0 - diff --git a/testing/source/rust/hack.diff b/testing/source/rust/hack.diff new file mode 100644 index 000000000..c5031fb01 --- /dev/null +++ b/testing/source/rust/hack.diff @@ -0,0 +1,29 @@ +--- ./src/bootstrap/dist.rs.orig 2019-11-07 18:12:33.835944390 -0600 ++++ ./src/bootstrap/dist.rs 2019-11-07 22:05:17.991788876 -0600 +@@ -676,7 +676,6 @@ + } + + builder.ensure(compile::Std { compiler, target }); +- builder.ensure(compile::Rustc { compiler, target }); + + let image = tmpdir(builder).join(format!("{}-{}-image", name, target)); + let _ = fs::remove_dir_all(&image); +@@ -691,12 +690,12 @@ + builder.copy(&path, &dst.join(path.file_name().unwrap())); + } + } +- let stamp = dbg!(compile::librustc_stamp(builder, compiler_to_use, target)); +- for (path, host) in builder.read_stamp_file(&stamp) { +- if !host { +- builder.copy(&path, &dst.join(path.file_name().unwrap())); +- } +- } ++ // let stamp = dbg!(compile::librustc_stamp(builder, compiler_to_use, target)); ++ // for (path, host) in builder.read_stamp_file(&stamp) { ++ // if !host { ++ // builder.copy(&path, &dst.join(path.file_name().unwrap())); ++ // } ++ // } + + let mut cmd = rust_installer(builder); + cmd.arg("generate") diff --git a/testing/source/rust/rust.SlackBuild b/testing/source/rust/rust.SlackBuild index b76374cf7..2dee9b218 100755 --- a/testing/source/rust/rust.SlackBuild +++ b/testing/source/rust/rust.SlackBuild @@ -26,17 +26,17 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rust SRCNAM="${PKGNAM}c" -VERSION=${VERSION:-1.38.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.39.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.37.0} -RSTAGE0_DIR=${RSTAGE0_DIR:-2019-08-15} -CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.38.0} +RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.38.0} +RSTAGE0_DIR=${RSTAGE0_DIR:-2019-09-26} +CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.39.0} CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR} # Automatically determine the architecture we're building on: @@ -150,6 +150,7 @@ fi # Try to debloat the build: zcat $CWD/0001-WIP-minimize-the-rust-std-component.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/hack.diff.gz | patch -p1 --verbose || exit 1 if [ "$LOCAL_BOOTSTRAP" != "yes" ] ; then # rust requires bootstrapping with the previous rust version. diff --git a/testing/source/rust/rust.url b/testing/source/rust/rust.url index 560589366..a6838aff4 100644 --- a/testing/source/rust/rust.url +++ b/testing/source/rust/rust.url @@ -1,5 +1,5 @@ # Source code (repacked to .tar.xz): -lftpget https://static.rust-lang.org/dist/rustc-1.38.0-src.tar.gz +lftpget https://static.rust-lang.org/dist/rustc-1.39.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/2019-08-15/cargo-0.38.0-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-08-15/rust-std-1.37.0-i686-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-08-15/rustc-1.37.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-09-26/cargo-0.39.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-09-26/rust-std-1.38.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-09-26/rustc-1.38.0-i686-unknown-linux-gnu.tar.gz # x86_64 bootstrap: -lftpget https://static.rust-lang.org/dist/2019-08-15/cargo-0.38.0-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-08-15/rust-std-1.37.0-x86_64-unknown-linux-gnu.tar.gz -lftpget https://static.rust-lang.org/dist/2019-08-15/rustc-1.37.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-09-26/cargo-0.39.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-09-26/rust-std-1.38.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-09-26/rustc-1.38.0-x86_64-unknown-linux-gnu.tar.gz -- cgit v1.2.3