* Re: rustup: update to 1.23.1.
2020-12-23 12:00 [PR PATCH] rustup: update to 1.23.1 jcgruenhage
@ 2020-12-23 12:26 ` jcgruenhage
2020-12-23 13:33 ` ericonr
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: jcgruenhage @ 2020-12-23 12:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 322 bytes --]
New comment by jcgruenhage on void-packages repository
https://github.com/void-linux/void-packages/pull/27374#issuecomment-750257956
Comment:
So, rustup now fails *earlier* than before for armv6-musl. Before, it failed on post_build, now it already fails on do_build. Should we just mark rustup as broken on armv6-musl?
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: rustup: update to 1.23.1.
2020-12-23 12:00 [PR PATCH] rustup: update to 1.23.1 jcgruenhage
2020-12-23 12:26 ` jcgruenhage
@ 2020-12-23 13:33 ` ericonr
2020-12-24 13:35 ` [PR PATCH] [Updated] " jcgruenhage
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2020-12-23 13:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 219 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27374#issuecomment-750302466
Comment:
Yeah, broken is probably correct, I think...
That or `archs="~armv6l-musl"`
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR PATCH] [Updated] rustup: update to 1.23.1.
2020-12-23 12:00 [PR PATCH] rustup: update to 1.23.1 jcgruenhage
2020-12-23 12:26 ` jcgruenhage
2020-12-23 13:33 ` ericonr
@ 2020-12-24 13:35 ` jcgruenhage
2020-12-24 13:43 ` jcgruenhage
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: jcgruenhage @ 2020-12-24 13:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages rustup-1.23.1_1
https://github.com/void-linux/void-packages/pull/27374
rustup: update to 1.23.1.
A patch file from https://github.com/void-linux/void-packages/pull/27374.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rustup-1.23.1_1-27374.patch --]
[-- Type: text/x-diff, Size: 1183 bytes --]
From 139fc373ec150f9e226b7099bb3e010aab694185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 23 Dec 2020 12:58:19 +0100
Subject: [PATCH] rustup: update to 1.23.1.
---
srcpkgs/rustup/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 6472ae1f10c..3e2e1082769 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,7 @@
# Template file for 'rustup'
pkgname=rustup
-version=1.22.1
-revision=2
+version=1.23.1
+revision=1
build_style=cargo
build_helper=qemu
configure_args="--features no-self-update --bin rustup-init"
@@ -12,7 +12,8 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="Apache-2.0, MIT"
homepage="https://www.rustup.rs"
distfiles="https://github.com/rust-lang/${pkgname}/archive/${version}.tar.gz"
-checksum=ad46cc624f318a9493aa62fc9612a450564fe20ba93c689e0ad856bff3c64c5b
+checksum=0203231bfe405ee1c7d5e7e1c013b9b8a2dc87fbd8474e77f500331d8c26365f
+archs="~armv6l-musl"
post_build() {
# rustup errors out because it doesn't know about armv6l-musl
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR PATCH] [Updated] rustup: update to 1.23.1.
2020-12-23 12:00 [PR PATCH] rustup: update to 1.23.1 jcgruenhage
` (2 preceding siblings ...)
2020-12-24 13:35 ` [PR PATCH] [Updated] " jcgruenhage
@ 2020-12-24 13:43 ` jcgruenhage
2020-12-26 5:56 ` [PR REVIEW] " ericonr
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: jcgruenhage @ 2020-12-24 13:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages rustup-1.23.1_1
https://github.com/void-linux/void-packages/pull/27374
rustup: update to 1.23.1.
A patch file from https://github.com/void-linux/void-packages/pull/27374.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rustup-1.23.1_1-27374.patch --]
[-- Type: text/x-diff, Size: 1183 bytes --]
From 1ffa47ecb7112babcf7f411a34a9727b543b1943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 23 Dec 2020 12:58:19 +0100
Subject: [PATCH] rustup: update to 1.23.1.
---
srcpkgs/rustup/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 6472ae1f10c..c954904bfcc 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,8 @@
# Template file for 'rustup'
pkgname=rustup
-version=1.22.1
-revision=2
+version=1.23.1
+revision=1
+archs="~armv6l-musl"
build_style=cargo
build_helper=qemu
configure_args="--features no-self-update --bin rustup-init"
@@ -12,7 +13,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="Apache-2.0, MIT"
homepage="https://www.rustup.rs"
distfiles="https://github.com/rust-lang/${pkgname}/archive/${version}.tar.gz"
-checksum=ad46cc624f318a9493aa62fc9612a450564fe20ba93c689e0ad856bff3c64c5b
+checksum=0203231bfe405ee1c7d5e7e1c013b9b8a2dc87fbd8474e77f500331d8c26365f
post_build() {
# rustup errors out because it doesn't know about armv6l-musl
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR REVIEW] rustup: update to 1.23.1.
2020-12-23 12:00 [PR PATCH] rustup: update to 1.23.1 jcgruenhage
` (3 preceding siblings ...)
2020-12-24 13:43 ` jcgruenhage
@ 2020-12-26 5:56 ` ericonr
2020-12-26 5:56 ` ericonr
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2020-12-26 5:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 250 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27374#discussion_r548947810
Comment:
If it won't be built for armv6l-musl anymre, the special casing around it below should be fixed as well
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR REVIEW] rustup: update to 1.23.1.
2020-12-23 12:00 [PR PATCH] rustup: update to 1.23.1 jcgruenhage
` (4 preceding siblings ...)
2020-12-26 5:56 ` [PR REVIEW] " ericonr
@ 2020-12-26 5:56 ` ericonr
2020-12-27 9:36 ` [PR PATCH] [Updated] " jcgruenhage
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2020-12-26 5:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 232 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/27374#discussion_r548947880
Comment:
```suggestion
# rustup doesn't recognize this as a target
archs="~armv6l-musl"
```
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR PATCH] [Updated] rustup: update to 1.23.1.
2020-12-23 12:00 [PR PATCH] rustup: update to 1.23.1 jcgruenhage
` (5 preceding siblings ...)
2020-12-26 5:56 ` ericonr
@ 2020-12-27 9:36 ` jcgruenhage
2020-12-27 9:37 ` jcgruenhage
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: jcgruenhage @ 2020-12-27 9:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages rustup-1.23.1_1
https://github.com/void-linux/void-packages/pull/27374
rustup: update to 1.23.1.
A patch file from https://github.com/void-linux/void-packages/pull/27374.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rustup-1.23.1_1-27374.patch --]
[-- Type: text/x-diff, Size: 1183 bytes --]
From 0fdf2605cc3cdacc50796d1e71a0cd69c45196ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 23 Dec 2020 12:58:19 +0100
Subject: [PATCH] rustup: update to 1.23.1.
---
srcpkgs/rustup/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 6472ae1f10c..c954904bfcc 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,8 @@
# Template file for 'rustup'
pkgname=rustup
-version=1.22.1
-revision=2
+version=1.23.1
+revision=1
+archs="~armv6l-musl"
build_style=cargo
build_helper=qemu
configure_args="--features no-self-update --bin rustup-init"
@@ -12,7 +13,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="Apache-2.0, MIT"
homepage="https://www.rustup.rs"
distfiles="https://github.com/rust-lang/${pkgname}/archive/${version}.tar.gz"
-checksum=ad46cc624f318a9493aa62fc9612a450564fe20ba93c689e0ad856bff3c64c5b
+checksum=0203231bfe405ee1c7d5e7e1c013b9b8a2dc87fbd8474e77f500331d8c26365f
post_build() {
# rustup errors out because it doesn't know about armv6l-musl
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR PATCH] [Updated] rustup: update to 1.23.1.
2020-12-23 12:00 [PR PATCH] rustup: update to 1.23.1 jcgruenhage
` (6 preceding siblings ...)
2020-12-27 9:36 ` [PR PATCH] [Updated] " jcgruenhage
@ 2020-12-27 9:37 ` jcgruenhage
2021-01-08 5:03 ` [PR PATCH] [Merged]: " ericonr
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: jcgruenhage @ 2020-12-27 9:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 331 bytes --]
There is an updated pull request by jcgruenhage against master on the void-packages repository
https://github.com/jcgruenhage/void-packages rustup-1.23.1_1
https://github.com/void-linux/void-packages/pull/27374
rustup: update to 1.23.1.
A patch file from https://github.com/void-linux/void-packages/pull/27374.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rustup-1.23.1_1-27374.patch --]
[-- Type: text/x-diff, Size: 2207 bytes --]
From 1d2a346e8c1cfb76ca90c4ceec86c9026f822172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Wed, 23 Dec 2020 12:58:19 +0100
Subject: [PATCH] rustup: update to 1.23.1.
---
srcpkgs/rustup/template | 32 +++++++++++++++-----------------
1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/rustup/template b/srcpkgs/rustup/template
index 6472ae1f10c..279c30e2dae 100644
--- a/srcpkgs/rustup/template
+++ b/srcpkgs/rustup/template
@@ -1,7 +1,9 @@
# Template file for 'rustup'
pkgname=rustup
-version=1.22.1
-revision=2
+version=1.23.1
+revision=1
+# rustup doesn't recognize this target
+archs="~armv6l-musl"
build_style=cargo
build_helper=qemu
configure_args="--features no-self-update --bin rustup-init"
@@ -12,28 +14,24 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="Apache-2.0, MIT"
homepage="https://www.rustup.rs"
distfiles="https://github.com/rust-lang/${pkgname}/archive/${version}.tar.gz"
-checksum=ad46cc624f318a9493aa62fc9612a450564fe20ba93c689e0ad856bff3c64c5b
+checksum=0203231bfe405ee1c7d5e7e1c013b9b8a2dc87fbd8474e77f500331d8c26365f
post_build() {
- # rustup errors out because it doesn't know about armv6l-musl
- if [ "$XBPS_TARGET_MACHINE" != armv6l-musl ]; then
- RUSTUP="target/${RUST_TARGET}/release/rustup-init"
- ln -sf "$RUSTUP" rustup
- # generate shell completions
- vtargetrun ./rustup completions zsh >rustup.zsh
- vtargetrun ./rustup completions bash >rustup.bash
- vtargetrun ./rustup completions fish >rustup.fish
- fi
+ RUSTUP="target/${RUST_TARGET}/release/rustup-init"
+ ln -sf "$RUSTUP" rustup
+
+ # generate shell completions
+ vtargetrun ./rustup completions zsh >rustup.zsh
+ vtargetrun ./rustup completions bash >rustup.bash
+ vtargetrun ./rustup completions fish >rustup.fish
}
do_install() {
vbin target/${RUST_TARGET}/release/rustup-init
- if [ "$XBPS_TARGET_MACHINE" != armv6l-musl ]; then
- vcompletion rustup.bash bash
- vcompletion rustup.fish fish
- vcompletion rustup.zsh zsh
- fi
+ vcompletion rustup.bash bash
+ vcompletion rustup.fish fish
+ vcompletion rustup.zsh zsh
vdoc README.md
vlicense LICENSE-APACHE
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PR PATCH] [Merged]: rustup: update to 1.23.1.
2020-12-23 12:00 [PR PATCH] rustup: update to 1.23.1 jcgruenhage
` (7 preceding siblings ...)
2020-12-27 9:37 ` jcgruenhage
@ 2021-01-08 5:03 ` ericonr
2021-01-08 11:25 ` Piraty
2021-01-08 11:30 ` Piraty
10 siblings, 0 replies; 12+ messages in thread
From: ericonr @ 2021-01-08 5:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 159 bytes --]
There's a merged pull request on the void-packages repository
rustup: update to 1.23.1.
https://github.com/void-linux/void-packages/pull/27374
Description:
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: rustup: update to 1.23.1.
2020-12-23 12:00 [PR PATCH] rustup: update to 1.23.1 jcgruenhage
` (8 preceding siblings ...)
2021-01-08 5:03 ` [PR PATCH] [Merged]: " ericonr
@ 2021-01-08 11:25 ` Piraty
2021-01-08 11:30 ` Piraty
10 siblings, 0 replies; 12+ messages in thread
From: Piraty @ 2021-01-08 11:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 146 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/27374#issuecomment-756705236
Comment:
#27759
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: rustup: update to 1.23.1.
2020-12-23 12:00 [PR PATCH] rustup: update to 1.23.1 jcgruenhage
` (9 preceding siblings ...)
2021-01-08 11:25 ` Piraty
@ 2021-01-08 11:30 ` Piraty
10 siblings, 0 replies; 12+ messages in thread
From: Piraty @ 2021-01-08 11:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 261 bytes --]
New comment by Piraty on void-packages repository
https://github.com/void-linux/void-packages/pull/27374#issuecomment-756707422
Comment:
ab6576648f121037ddbcb6c5fd19064e7abe2554 armv7-musl is broken as well which went unnoticed as CI doesn't build armv7-musl
^ permalink raw reply [flat|nested] 12+ messages in thread