* [PR PATCH] rust: update to 1.58.0
@ 2022-03-21 14:16 subnut
2022-03-21 16:13 ` q66
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: subnut @ 2022-03-21 14:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1218 bytes --]
There is a new pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages rust-1.58.0
https://github.com/void-linux/void-packages/pull/36261
rust: update to 1.58.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36261.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-1.58.0-36261.patch --]
[-- Type: text/x-diff, Size: 5382 bytes --]
From 0bb77ce489ddcf8ce346291907595215a53fde58 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Mon, 21 Mar 2022 19:41:03 +0530
Subject: [PATCH] rust: update to 1.58.0
---
.../rust/patches/0001-musl-void-setup.patch | 35 ++-----------------
...kage-of-musl-libc-for-the-libc-crate.patch | 8 ++---
srcpkgs/rust/template | 4 +--
3 files changed, 9 insertions(+), 38 deletions(-)
diff --git a/srcpkgs/rust/patches/0001-musl-void-setup.patch b/srcpkgs/rust/patches/0001-musl-void-setup.patch
index 427581c48f54..d42d9ac2ae5d 100644
--- a/srcpkgs/rust/patches/0001-musl-void-setup.patch
+++ b/srcpkgs/rust/patches/0001-musl-void-setup.patch
@@ -135,7 +135,7 @@ index e9cc7662e63..4971534ba0e 100644
+++ b/src/bootstrap/compile.rs
@@ -199,36 +199,7 @@ fn copy_self_contained_objects(
- // Copies the CRT objects.
+ // Copies the libc and CRT objects.
//
- // rustc historically provides a more self-contained installation for musl targets
- // not requiring the presence of a native musl toolchain. For example, it can fall back
@@ -146,7 +146,7 @@ index e9cc7662e63..4971534ba0e 100644
- let srcdir = builder.musl_libdir(target).unwrap_or_else(|| {
- panic!("Target {:?} does not have a \"musl-libdir\" key", target.triple)
- });
-- for &obj in &["crt1.o", "Scrt1.o", "rcrt1.o", "crti.o", "crtn.o"] {
+- for &obj in &["libc.a", "crt1.o", "Scrt1.o", "rcrt1.o", "crti.o", "crtn.o"] {
- copy_and_stamp(
- builder,
- &libdir_self_contained,
@@ -285,15 +285,7 @@ diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index 2d4e1527897..3abe9f4a143 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
-@@ -277,7 +277,6 @@ pub struct Build {
- struct Crate {
- name: Interned<String>,
- deps: HashSet<Interned<String>>,
-- id: String,
- path: PathBuf,
- }
-
-@@ -1056,25 +1055,6 @@ fn crt_static(&self, target: TargetSelection) -> Option<bool> {
+@@ -1055,25 +1056,6 @@ impl Build {
}
}
@@ -319,27 +311,6 @@ index 2d4e1527897..3abe9f4a143 100644
/// Returns the sysroot for the wasi target, if defined
fn wasi_root(&self, target: TargetSelection) -> Option<&Path> {
self.config.target_config.get(&target).and_then(|t| t.wasi_root.as_ref()).map(|p| &**p)
-diff --git a/src/bootstrap/metadata.rs b/src/bootstrap/metadata.rs
-index a38391c7b88..65e229697dc 100644
---- a/src/bootstrap/metadata.rs
-+++ b/src/bootstrap/metadata.rs
-@@ -14,7 +14,6 @@ struct Output {
-
- #[derive(Deserialize)]
- struct Package {
-- id: String,
- name: String,
- source: Option<String>,
- manifest_path: String,
-@@ -50,7 +49,7 @@ pub fn build(build: &mut Build) {
- .filter(|dep| dep.source.is_none())
- .map(|dep| INTERNER.intern_string(dep.name))
- .collect();
-- build.crates.insert(name, Crate { name, id: package.id, deps, path });
-+ build.crates.insert(name, Crate { name, deps, path });
- }
- }
- }
diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
index d7db2cef24f..a791177956d 100644
--- a/src/bootstrap/sanity.rs
diff --git a/srcpkgs/rust/patches/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch b/srcpkgs/rust/patches/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
index a9ca5f6c7bba..8a18e414e209 100644
--- a/srcpkgs/rust/patches/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
+++ b/srcpkgs/rust/patches/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
@@ -12,14 +12,14 @@ diff --git a/vendor/libc/src/unix/mod.rs b/vendor/libc/src/unix/mod.rs
index 238da24b..ffb05ee7 100644
--- a/vendor/libc/src/unix/mod.rs
+++ b/vendor/libc/src/unix/mod.rs
-@@ -299,11 +299,11 @@ cfg_if! {
- // cargo build, don't pull in anything extra as the libstd dep
- // already pulls in all libs.
+@@ -329,11 +329,11 @@ cfg_if! {
+ #[link(name = "c", cfg(not(target_feature = "crt-static")))]
+ extern {}
} else if #[cfg(target_env = "musl")] {
+ #[link(name = "c")]
+ extern {}
#[cfg_attr(feature = "rustc-dep-of-std",
-- link(name = "c", kind = "static",
+- link(name = "c", kind = "static", modifiers = "-bundle",
+ link(name = "gcc", kind = "static-nobundle",
cfg(target_feature = "crt-static")))]
- #[cfg_attr(feature = "rustc-dep-of-std",
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 560a629f3da2..d051ca54fea1 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -8,7 +8,7 @@
# uploaded to https://alpha.de.repo.voidlinux.org/distfiles/
#
pkgname=rust
-version=1.57.0
+version=1.58.0
revision=1
wrksrc="rustc-${version}-src"
hostmakedepends="cmake curl pkg-config python3 tar cargo-bootstrap"
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, Apache-2.0"
homepage="https://www.rust-lang.org/"
distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
-checksum=3546f9c3b91b1f8b8efd26c94d6b50312c08210397b4072ed2748e2bd4445c1a
+checksum=0ad531a32f3c2e996b9322c6b7262a9cfe557e49ff3363adea07b575106cd770
lib32disabled=yes
make_check=no # CBA for now
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: rust: update to 1.58.0
2022-03-21 14:16 [PR PATCH] rust: update to 1.58.0 subnut
@ 2022-03-21 16:13 ` q66
2022-03-21 16:20 ` subnut
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: q66 @ 2022-03-21 16:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 176 bytes --]
New comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/36261#issuecomment-1074098019
Comment:
but 1.59 has been out for a while now?
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: rust: update to 1.58.0
2022-03-21 14:16 [PR PATCH] rust: update to 1.58.0 subnut
2022-03-21 16:13 ` q66
@ 2022-03-21 16:20 ` subnut
2022-03-21 18:06 ` subnut
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: subnut @ 2022-03-21 16:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 615 bytes --]
New comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/36261#issuecomment-1074110533
Comment:
Yeah, I will update this PR to 1.59.0 soon.
I wasn't able to build 1.59.0 due to problems while building `unwind` crate during the build process, so I thought I would give 1.58.0 a try. It did build, so I though of opening a draft PR and seeing if it builds for all architectures.
That's why this PR is draft. I'll un-draft it once i've got 1.59.0 working.
---
That said, if anybody has already gotten 1.59.0 working, I would very happily close this PR :smile:
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: rust: update to 1.58.0
2022-03-21 14:16 [PR PATCH] rust: update to 1.58.0 subnut
2022-03-21 16:13 ` q66
2022-03-21 16:20 ` subnut
@ 2022-03-21 18:06 ` subnut
2022-03-21 18:09 ` [PR PATCH] [Updated] [skip ci] " subnut
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: subnut @ 2022-03-21 18:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 321 bytes --]
New comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/36261#issuecomment-1074241977
Comment:
Current status -
- musl build is broken
- all other builds succeed
Documenting here because I'm gonna add [skip ci] because aarch64 and armv7l take nearly 3 hours to complete.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Updated] [skip ci] rust: update to 1.58.0
2022-03-21 14:16 [PR PATCH] rust: update to 1.58.0 subnut
` (2 preceding siblings ...)
2022-03-21 18:06 ` subnut
@ 2022-03-21 18:09 ` subnut
2022-03-21 19:24 ` subnut
2022-03-21 19:25 ` [PR PATCH] [Closed]: " subnut
5 siblings, 0 replies; 7+ messages in thread
From: subnut @ 2022-03-21 18:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1233 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages rust-1.58.0
https://github.com/void-linux/void-packages/pull/36261
[skip ci] rust: update to 1.58.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36261.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-1.58.0-36261.patch --]
[-- Type: text/x-diff, Size: 5807 bytes --]
From ba920195c43fd14d000cc8f781e6472c8227b65d Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Mon, 21 Mar 2022 19:41:03 +0530
Subject: [PATCH] rust: update to 1.58.0
---
.../rust/patches/0001-musl-void-setup.patch | 35 ++-----------------
... 0010-do-not-export-LD_LIBRARY_PATH.patch} | 0
...kage-of-musl-libc-for-the-libc-crate.patch | 8 ++---
srcpkgs/rust/template | 4 +--
4 files changed, 9 insertions(+), 38 deletions(-)
rename srcpkgs/rust/patches/{ld-library-path.patch => 0010-do-not-export-LD_LIBRARY_PATH.patch} (100%)
diff --git a/srcpkgs/rust/patches/0001-musl-void-setup.patch b/srcpkgs/rust/patches/0001-musl-void-setup.patch
index 427581c48f54..d42d9ac2ae5d 100644
--- a/srcpkgs/rust/patches/0001-musl-void-setup.patch
+++ b/srcpkgs/rust/patches/0001-musl-void-setup.patch
@@ -135,7 +135,7 @@ index e9cc7662e63..4971534ba0e 100644
+++ b/src/bootstrap/compile.rs
@@ -199,36 +199,7 @@ fn copy_self_contained_objects(
- // Copies the CRT objects.
+ // Copies the libc and CRT objects.
//
- // rustc historically provides a more self-contained installation for musl targets
- // not requiring the presence of a native musl toolchain. For example, it can fall back
@@ -146,7 +146,7 @@ index e9cc7662e63..4971534ba0e 100644
- let srcdir = builder.musl_libdir(target).unwrap_or_else(|| {
- panic!("Target {:?} does not have a \"musl-libdir\" key", target.triple)
- });
-- for &obj in &["crt1.o", "Scrt1.o", "rcrt1.o", "crti.o", "crtn.o"] {
+- for &obj in &["libc.a", "crt1.o", "Scrt1.o", "rcrt1.o", "crti.o", "crtn.o"] {
- copy_and_stamp(
- builder,
- &libdir_self_contained,
@@ -285,15 +285,7 @@ diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index 2d4e1527897..3abe9f4a143 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
-@@ -277,7 +277,6 @@ pub struct Build {
- struct Crate {
- name: Interned<String>,
- deps: HashSet<Interned<String>>,
-- id: String,
- path: PathBuf,
- }
-
-@@ -1056,25 +1055,6 @@ fn crt_static(&self, target: TargetSelection) -> Option<bool> {
+@@ -1055,25 +1056,6 @@ impl Build {
}
}
@@ -319,27 +311,6 @@ index 2d4e1527897..3abe9f4a143 100644
/// Returns the sysroot for the wasi target, if defined
fn wasi_root(&self, target: TargetSelection) -> Option<&Path> {
self.config.target_config.get(&target).and_then(|t| t.wasi_root.as_ref()).map(|p| &**p)
-diff --git a/src/bootstrap/metadata.rs b/src/bootstrap/metadata.rs
-index a38391c7b88..65e229697dc 100644
---- a/src/bootstrap/metadata.rs
-+++ b/src/bootstrap/metadata.rs
-@@ -14,7 +14,6 @@ struct Output {
-
- #[derive(Deserialize)]
- struct Package {
-- id: String,
- name: String,
- source: Option<String>,
- manifest_path: String,
-@@ -50,7 +49,7 @@ pub fn build(build: &mut Build) {
- .filter(|dep| dep.source.is_none())
- .map(|dep| INTERNER.intern_string(dep.name))
- .collect();
-- build.crates.insert(name, Crate { name, id: package.id, deps, path });
-+ build.crates.insert(name, Crate { name, deps, path });
- }
- }
- }
diff --git a/src/bootstrap/sanity.rs b/src/bootstrap/sanity.rs
index d7db2cef24f..a791177956d 100644
--- a/src/bootstrap/sanity.rs
diff --git a/srcpkgs/rust/patches/ld-library-path.patch b/srcpkgs/rust/patches/0010-do-not-export-LD_LIBRARY_PATH.patch
similarity index 100%
rename from srcpkgs/rust/patches/ld-library-path.patch
rename to srcpkgs/rust/patches/0010-do-not-export-LD_LIBRARY_PATH.patch
diff --git a/srcpkgs/rust/patches/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch b/srcpkgs/rust/patches/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
index a9ca5f6c7bba..8a18e414e209 100644
--- a/srcpkgs/rust/patches/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
+++ b/srcpkgs/rust/patches/0012-Fix-dynamic-linkage-of-musl-libc-for-the-libc-crate.patch
@@ -12,14 +12,14 @@ diff --git a/vendor/libc/src/unix/mod.rs b/vendor/libc/src/unix/mod.rs
index 238da24b..ffb05ee7 100644
--- a/vendor/libc/src/unix/mod.rs
+++ b/vendor/libc/src/unix/mod.rs
-@@ -299,11 +299,11 @@ cfg_if! {
- // cargo build, don't pull in anything extra as the libstd dep
- // already pulls in all libs.
+@@ -329,11 +329,11 @@ cfg_if! {
+ #[link(name = "c", cfg(not(target_feature = "crt-static")))]
+ extern {}
} else if #[cfg(target_env = "musl")] {
+ #[link(name = "c")]
+ extern {}
#[cfg_attr(feature = "rustc-dep-of-std",
-- link(name = "c", kind = "static",
+- link(name = "c", kind = "static", modifiers = "-bundle",
+ link(name = "gcc", kind = "static-nobundle",
cfg(target_feature = "crt-static")))]
- #[cfg_attr(feature = "rustc-dep-of-std",
diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index 560a629f3da2..d051ca54fea1 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -8,7 +8,7 @@
# uploaded to https://alpha.de.repo.voidlinux.org/distfiles/
#
pkgname=rust
-version=1.57.0
+version=1.58.0
revision=1
wrksrc="rustc-${version}-src"
hostmakedepends="cmake curl pkg-config python3 tar cargo-bootstrap"
@@ -19,7 +19,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT, Apache-2.0"
homepage="https://www.rust-lang.org/"
distfiles="https://static.rust-lang.org/dist/rustc-${version}-src.tar.gz"
-checksum=3546f9c3b91b1f8b8efd26c94d6b50312c08210397b4072ed2748e2bd4445c1a
+checksum=0ad531a32f3c2e996b9322c6b7262a9cfe557e49ff3363adea07b575106cd770
lib32disabled=yes
make_check=no # CBA for now
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [skip ci] rust: update to 1.58.0
2022-03-21 14:16 [PR PATCH] rust: update to 1.58.0 subnut
` (3 preceding siblings ...)
2022-03-21 18:09 ` [PR PATCH] [Updated] [skip ci] " subnut
@ 2022-03-21 19:24 ` subnut
2022-03-21 19:25 ` [PR PATCH] [Closed]: " subnut
5 siblings, 0 replies; 7+ messages in thread
From: subnut @ 2022-03-21 19:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 204 bytes --]
New comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/36261#issuecomment-1074327248
Comment:
Update: I got rust 1.59.0 working. Will open a new PR for that.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PR PATCH] [Closed]: [skip ci] rust: update to 1.58.0
2022-03-21 14:16 [PR PATCH] rust: update to 1.58.0 subnut
` (4 preceding siblings ...)
2022-03-21 19:24 ` subnut
@ 2022-03-21 19:25 ` subnut
5 siblings, 0 replies; 7+ messages in thread
From: subnut @ 2022-03-21 19:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1075 bytes --]
There's a closed pull request on the void-packages repository
[skip ci] rust: update to 1.58.0
https://github.com/void-linux/void-packages/pull/36261
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-03-21 19:25 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-21 14:16 [PR PATCH] rust: update to 1.58.0 subnut
2022-03-21 16:13 ` q66
2022-03-21 16:20 ` subnut
2022-03-21 18:06 ` subnut
2022-03-21 18:09 ` [PR PATCH] [Updated] [skip ci] " subnut
2022-03-21 19:24 ` subnut
2022-03-21 19:25 ` [PR PATCH] [Closed]: " subnut
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).