[arch-commits] Commit in rust/trunk (3 files)

Jan Steffens heftig at archlinux.org
Fri Dec 20 02:34:51 UTC 2019


    Date: Friday, December 20, 2019 @ 02:34:51
  Author: heftig
Revision: 371947

1.40.0-1

Modified:
  rust/trunk/PKGBUILD
Deleted:
  rust/trunk/0001-WIP-minimize-the-rust-std-component.patch
  rust/trunk/0002-Hopefully-fix-rustdoc-build.patch

------------------------------------------------+
 0001-WIP-minimize-the-rust-std-component.patch |   62 -----------------------
 0002-Hopefully-fix-rustdoc-build.patch         |   38 --------------
 PKGBUILD                                       |   20 +------
 3 files changed, 4 insertions(+), 116 deletions(-)

Deleted: 0001-WIP-minimize-the-rust-std-component.patch
===================================================================
--- 0001-WIP-minimize-the-rust-std-component.patch	2019-12-19 22:58:51 UTC (rev 371946)
+++ 0001-WIP-minimize-the-rust-std-component.patch	2019-12-20 02:34:51 UTC (rev 371947)
@@ -1,62 +0,0 @@
-From e36ab8edbda3695abf3bf892c0fcb17a1f306302 Mon Sep 17 00:00:00 2001
-From: Josh Stone <jistone at redhat.com>
-Date: Fri, 27 Sep 2019 12:33:08 -0700
-Subject: [PATCH 1/2] [WIP] minimize the rust-std component
-
----
- src/bootstrap/dist.rs | 33 +++++++++------------------------
- 1 file changed, 9 insertions(+), 24 deletions(-)
-
-diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
-index d9dff77a30e..bd96a6371fc 100644
---- a/src/bootstrap/dist.rs
-+++ b/src/bootstrap/dist.rs
-@@ -675,36 +675,21 @@ impl Step for Std {
-             return distdir(builder).join(format!("{}-{}.tar.gz", name, target));
-         }
- 
--        // We want to package up as many target libraries as possible
--        // for the `rust-std` package, so if this is a host target we
--        // depend on librustc and otherwise we just depend on libtest.
--        if builder.hosts.iter().any(|t| t == target) {
--            builder.ensure(compile::Rustc { compiler, target });
--        } else {
--            builder.ensure(compile::Std { compiler, target });
--        }
-+        builder.ensure(compile::Std { compiler, target });
- 
-         let image = tmpdir(builder).join(format!("{}-{}-image", name, target));
-         let _ = fs::remove_dir_all(&image);
- 
--        let dst = image.join("lib/rustlib").join(target);
-+        let dst = image.join("lib/rustlib").join(target).join("lib");
-         t!(fs::create_dir_all(&dst));
--        let mut src = builder.sysroot_libdir(compiler, target).to_path_buf();
--        src.pop(); // Remove the trailing /lib folder from the sysroot_libdir
--        builder.cp_filtered(&src, &dst, &|path| {
--            if let Some(name) = path.file_name().and_then(|s| s.to_str()) {
--                if name == builder.config.rust_codegen_backends_dir.as_str() {
--                    return false
--                }
--                if name == "bin" {
--                    return false
--                }
--                if name.contains("LLVM") {
--                    return false
--                }
-+
-+        let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target);
-+        let stamp = dbg!(compile::libstd_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()));
-             }
--            true
--        });
-+        }
- 
-         let mut cmd = rust_installer(builder);
-         cmd.arg("generate")
--- 
-2.24.0
-

Deleted: 0002-Hopefully-fix-rustdoc-build.patch
===================================================================
--- 0002-Hopefully-fix-rustdoc-build.patch	2019-12-19 22:58:51 UTC (rev 371946)
+++ 0002-Hopefully-fix-rustdoc-build.patch	2019-12-20 02:34:51 UTC (rev 371947)
@@ -1,38 +0,0 @@
-From 3e846aeb807bfc41576b4efbee882c4475f0cb75 Mon Sep 17 00:00:00 2001
-From: Mark Rousskov <mark.simulacrum at gmail.com>
-Date: Tue, 5 Nov 2019 11:16:46 -0500
-Subject: [PATCH 2/2] Hopefully fix rustdoc build
-
-It's super unclear why this broke when we switched to beta but not
-previously -- but at least it's hopefully fixed now.
----
- src/bootstrap/builder.rs | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index 5d586f0c461..bad92d77385 100644
---- a/src/bootstrap/builder.rs
-+++ b/src/bootstrap/builder.rs
-@@ -875,7 +875,18 @@ impl<'a> Builder<'a> {
-         // things still build right, please do!
-         match mode {
-             Mode::Std => metadata.push_str("std"),
--            _ => {},
-+            // When we're building rustc tools, they're built with a search path
-+            // that contains things built during the rustc build. For example,
-+            // bitflags is built during the rustc build, and is a dependency of
-+            // rustdoc as well. We're building rustdoc in a different target
-+            // directory, though, which means that Cargo will rebuild the
-+            // dependency. When we go on to build rustdoc, we'll look for
-+            // bitflags, and find two different copies: one built during the
-+            // rustc step and one that we just built. This isn't always a
-+            // problem, somehow -- not really clear why -- but we know that this
-+            // fixes things.
-+            Mode::ToolRustc => metadata.push_str("tool-rustc"),
-+            _ => {}
-         }
-         cargo.env("__CARGO_DEFAULT_LIB_METADATA", &metadata);
- 
--- 
-2.24.0
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-12-19 22:58:51 UTC (rev 371946)
+++ PKGBUILD	2019-12-20 02:34:51 UTC (rev 371947)
@@ -5,7 +5,7 @@
 
 pkgname=('rust' 'lib32-rust-libs' 'rust-docs')
 epoch=1
-pkgver=1.39.0
+pkgver=1.40.0
 pkgrel=1
 
 _llvm_ver=9.0.0
@@ -21,16 +21,12 @@
 options=('!emptydirs')
 
 source=("https://static.rust-lang.org/dist/rustc-$pkgver-src.tar.gz"{,.asc}
-        "http://releases.llvm.org/$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig}
-        0001-WIP-minimize-the-rust-std-component.patch
-        0002-Hopefully-fix-rustdoc-build.patch)
+        "http://releases.llvm.org/$_llvm_ver/compiler-rt-$_llvm_ver.src.tar.xz"{,.sig})
 
-sha256sums=('b4a1f6b6a93931f270691aba4fc85eee032fecda973e6b9c774cd06857609357'
+sha256sums=('dd97005578defc10a482bff3e4e728350d2099c60ffcf1f5e189540c39a549ad'
             'SKIP'
             '56e4cd96dd1d8c346b07b4d6b255f976570c6f2389697347a6c3dcb9e820d10e'
-            'SKIP'
-            'a7e525eb4d937f569ff126db0c08ca8098d0d8fe6c26132992d2ac108885dbf3'
-            'c376f987d55c65254522ce267956f68999d62bb86e3401e19ae0a092c943a7c3')
+            'SKIP')
 validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE'  # Rust Language (Tag and Release Signing Key) <rust-key at rust-lang.org>
               '474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard <tstellar at redhat.com>
               'B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
@@ -38,14 +34,6 @@
 prepare() {
   cd "rustc-$pkgver-src"
 
-  # For https://bugzilla.redhat.com/show_bug.cgi?id=1756487
-  # From https://src.fedoraproject.org/rpms/rust/tree/master
-  patch -Np1 -i ../0001-WIP-minimize-the-rust-std-component.patch
-
-  # For https://bugs.archlinux.org/task/64550
-  # From https://github.com/rust-lang/rust/issues/65795#issuecomment-551766737
-  patch -Np1 -i ../0002-Hopefully-fix-rustdoc-build.patch
-
   cat >config.toml <<END
 [llvm]
 link-shared = true


More information about the arch-commits mailing list