Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Rust to 1.51.0 #8194

Merged
merged 5 commits into from
Mar 28, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions mingw-w64-rust/0002-fix-install-msys2.patch

This file was deleted.

61 changes: 28 additions & 33 deletions mingw-w64-rust/0004-unbundle-gcc.patch
Original file line number Diff line number Diff line change
@@ -1,56 +1,51 @@
--- rustc-1.29.2-src/src/bootstrap/dist.rs.orig 2018-10-29 06:10:51.148386100 +0300
+++ rustc-1.29.2-src/src/bootstrap/dist.rs 2018-10-29 07:45:37.437710900 +0300
@@ -189,6 +189,7 @@
--- rustc-1.51.0-src/src/bootstrap/dist.rs.orig 2021-03-25 17:17:47.194810700 +0100
+++ rustc-1.51.0-src/src/bootstrap/dist.rs 2021-03-25 17:25:12.625438800 +0100
@@ -112,6 +112,7 @@
}
}

+#[allow(dead_code)]
fn find_files(files: &[&str], path: &[PathBuf]) -> Vec<PathBuf> {
let mut found = Vec::with_capacity(files.len());
@@ -208,6 +209,7 @@

@@ -128,6 +129,7 @@
found
}

+#[allow(dead_code)]
fn make_win_dist(
rust_root: &Path, plat_root: &Path, target_triple: Interned<String>, builder: &Builder
) {
@@ -362,7 +364,7 @@
rust_root: &Path,
plat_root: &Path,
@@ -295,7 +297,7 @@
// thrown away (this contains the runtime DLLs included in the rustc package
// above) and the second argument is where to place all the MinGW components
// (which is what we want).
- make_win_dist(&tmpdir(builder), &image, host, &builder);
+ //make_win_dist(&tmpdir(builder), &image, host, &builder);
let mut cmd = rust_installer(builder);
cmd.arg("generate")
@@ -442,13 +444,13 @@
- make_win_dist(&tmpdir(builder), tarball.image_dir(), host, &builder);
+ //make_win_dist(&tmpdir(builder), tarball.image_dir(), host, &builder);

Some(tarball.generate())
}
@@ -340,10 +342,10 @@
// anything requiring us to distribute a license, but it's likely the
// install will *also* include the rust-mingw package, which also needs
// licenses, so to be safe we just include it here in all MinGW packages.
- if host.contains("pc-windows-gnu") {
- make_win_dist(&image, &tmpdir(builder), host, builder);
+ //if host.contains("pc-windows-gnu") {
+ // make_win_dist(&image, &tmpdir(builder), host, builder);

- let dst = image.join("share/doc");
- t!(fs::create_dir_all(&dst));
- builder.cp_r(&builder.src.join("src/etc/third-party"), &dst);
- make_win_dist(tarball.image_dir(), &tmpdir(builder), host, builder);
- tarball.add_dir(builder.src.join("src/etc/third-party"), "share/doc");
- }
+ // let dst = image.join("share/doc");
+ // t!(fs::create_dir_all(&dst));
+ // builder.cp_r(&builder.src.join("src/etc/third-party"), &dst);
+ //if host.contains("pc-windows-gnu") {
+ // make_win_dist(tarball.image_dir(), &tmpdir(builder), host, builder);
+ // tarball.add_dir(builder.src.join("src/etc/third-party"), "share/doc");
+ //}
// Finally, wrap everything up in a nice tarball!
let mut cmd = rust_installer(builder);
--- rustc-1.29.2-src/src/bootstrap/lib.rs.orig 2018-10-29 07:40:35.561580700 +0300
+++ rustc-1.29.2-src/src/bootstrap/lib.rs 2018-10-29 07:45:54.426140700 +0300
@@ -1202,6 +1201,7 @@

return tarball.generate();

--- rustc-1.51.0-src/src/bootstrap/lib.rs.orig 2021-03-25 17:31:41.612856400 +0100
+++ rustc-1.51.0-src/src/bootstrap/lib.rs 2021-03-25 17:34:02.913055400 +0100
@@ -1274,6 +1274,7 @@
}
}

+ #[allow(dead_code)]
fn copy_to_folder(&self, src: &Path, dest_folder: &Path) {
let file_name = src.file_name().unwrap();
Expand Down
9 changes: 3 additions & 6 deletions mingw-w64-rust/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ _realname=rust
_bootstrapping=yes
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.49.0
pkgver=1.51.0
pkgrel=1
pkgdesc="Systems programming language focused on safety, speed and concurrency (mingw-w64)"
arch=('any')
Expand All @@ -32,17 +32,15 @@ options=('staticlibs')
source=("https://static.rust-lang.org/dist/${_realname}c-${pkgver}-src.tar.gz"
"force-curl-rust.patch"
"0001-add-missing-libs.patch"
"0002-fix-install-msys2.patch"
"0003-link-with-system-curl.patch"
"0004-unbundle-gcc.patch"
"0005-win32-config.patch"
"0006-Update-cc.patch")
sha256sums=('b50aefa8df1fdfc9bccafdbf37aee611c8dfe81bf5648d5f43699c50289dc779'
sha256sums=('7a6b9bafc8b3d81bbc566e7c0d1f17c9f499fd22b95142f7ea3a8e4d1f9eb847'
'500f9bd7452c8d35115ad823d8fcb9bda8b86878c2a0f57f9e6a72fc4ba9a8f5'
'20aae51f8fe525d677d81f4075011db4f413420393ccd212ba21d503880ddb61'
'13cb1817ef83b396e16fe271172a77648bffe5e90efbbe98eb5fefc5a8d91860'
'b16f65dfdc79e7a722b3e2589e90a1431a971038dd5dfa1394ec0427e3c0a2b4'
'1a3d00f3bcf5c21beaa20ee729c45b7b3d76cd2a2c6b70562020f11c1e9dcc6d'
'0a9bfe611d31279eec296bd656671b7f286b4738136d2471326ca5ef99b9adf7'
'061f1cf5374c926bc130a4afbde005dcd09fdbaee079469ad045fd23a7a88a2c'
'3c21cc518439f17944d368fcaf00648f048af4bcabc134f63acf47f32d8cc27b')
#validpgpkeys=('108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE') # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
Expand All @@ -55,7 +53,6 @@ prepare() {
cd ${srcdir}/${_realname}c-${pkgver}-src
patch -p1 -i "${srcdir}/force-curl-rust.patch"
patch -p1 -i "${srcdir}/0001-add-missing-libs.patch"
patch -p1 -i "${srcdir}/0002-fix-install-msys2.patch"
#patch -p1 -i "${srcdir}/0003-link-with-system-curl.patch"
patch -p1 -i "${srcdir}/0004-unbundle-gcc.patch"
patch -p1 -i "${srcdir}/0005-win32-config.patch"
Expand Down