* [PR PATCH] {rust,cargo}-bootstrap: hardcode platform triplets
@ 2023-02-06 12:36 tranzystorek-io
2023-02-06 12:42 ` [PR PATCH] [Updated] " tranzystorek-io
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: tranzystorek-io @ 2023-02-06 12:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1387 bytes --]
There is a new pull request by tranzystorek-io against master on the void-packages repository
https://github.com/tranzystorek-io/void-packages hardcpode-triplets
https://github.com/void-linux/void-packages/pull/42109
{rust,cargo}-bootstrap: hardcode platform triplets
- rust-boostrap: hardcode platform triplets
- cargo-bootstrap: hardcode platform triplets
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- 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/42109.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hardcpode-triplets-42109.patch --]
[-- Type: text/x-diff, Size: 5469 bytes --]
From b46f436f54914ce6191e7bb355e43bf5a42b354c Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 6 Feb 2023 13:33:53 +0100
Subject: [PATCH 1/2] rust-boostrap: hardcode platform triplets
---
srcpkgs/rust-bootstrap/template | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 23f147c9fcb9..400f95940d9c 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -24,42 +24,61 @@ case "$XBPS_TARGET_MACHINE" in
*) _bootstrap_url="https://repo-default.voidlinux.org/distfiles";;
esac
-distfiles="
- ${_bootstrap_url}/rustc-${version}-${RUST_TARGET}.tar.xz
- ${_bootstrap_url}/rust-std-${version}-${RUST_TARGET}.tar.xz"
-
+# hardcode platform triplets
+# because this info isn't avaialble here without hacky workarounds
case "$XBPS_TARGET_MACHINE" in
i686)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-i686-pc-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-i686-pc-linux-gnu.tar.xz"
checksum="
3d604e150c469461a64c17b6d26f96a5a3d6975246c92cd13ee9bc6e4df0aaeb
c80c57df63517d6171c061e6c095b794593172a3abefa9b4202992706bda12e5"
;;
x86_64)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-gnu.tar.xz"
checksum="
1f5756a03119853b53358018c5b1592940a2354c3c9f84ee7faf684e3478f8f0
6ace34bcbba9557aa2fc3a0515c3da4a83ca24d7d45506c5e1b32f589fa38a8b"
;;
x86_64-musl)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-musl.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-musl.tar.xz"
checksum="
5177d749b5dcc74596e314b73c5f3f3eabed8b3e207f812f229fbf0682c162ae
29af13a882abbe797fadd43afcb75bce2e2304438db9e21a3e64a2e9100501fb"
;;
ppc64le)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc64le-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc64le-unknown-linux-gnu.tar.xz"
checksum="
11630fc51fffe722e52f649357b5948c24b5305cfb61a8114527234e054451c4
ef697469b2a3ea8897f49b70e3be0c7aaca3f26fd3234812113e2e85cafac738"
;;
ppc64le-musl)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc64le-unknown-linux-musl.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc64le-unknown-linux-musl.tar.xz"
checksum="
9ae19e0cdb883aa67dc3e4ef7afca88f99c8c5d176ed9175e2f7652122c7d1d8
825b8f680d9e6e3d6b1451586bb09efb0c1f7d844d6874738e040cf3d6b20663"
;;
ppc64)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc64-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc64-unknown-linux-gnu.tar.xz"
checksum="
aae6418c71986a7f4ab7c7ab66d4f97531f0bdab50f14985c9403e2cff443de7
96485965f0a2dec274679cafbe4d39bd9e7c728824a6c5504f164ec9d5f57384"
;;
ppc)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc-unknown-linux-gnu.tar.xz"
checksum="
5f4de96bff2937fc0a64a216604c7af765af94460a1f283330eddc610d91271b
6b29ebec4cd705760db634717cf6df68a9a377d52c25def30f5a2e2641a83279"
From d86356688c13f9d3e7bbff0ccf20744b4dcac1a0 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 6 Feb 2023 13:34:26 +0100
Subject: [PATCH 2/2] cargo-bootstrap: hardcode platform triplets
---
srcpkgs/cargo-bootstrap/template | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index 4e39b797a035..38e566b99aa0 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -23,28 +23,35 @@ case "$XBPS_TARGET_MACHINE" in
*) _bootstrap_url="https://repo-default.voidlinux.org/distfiles" ;;
esac
-distfiles="${_bootstrap_url}/cargo-${version}-${RUST_TARGET}.tar.xz"
-
+# hardcode platform triplets
+# because this info isn't avaialble here without hacky workarounds
case "$XBPS_TARGET_MACHINE" in
i686)
+ distfiles="${_bootstrap_url}/cargo-${version}-i686-pc-linux-gnu.tar.xz"
checksum="e2e20a16f5db52cd6b773c94225b03880743544ff2f317dd857cf0dceac6ab57"
;;
x86_64)
+ distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
checksum="21434d83a30ad3fa4e4831487c5574a20b07dd57d213b26e1246290c57d4ec41"
;;
x86_64-musl)
+ distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
checksum="01d06176fd894b9299ed4f5b78e87d78a9a25b9ba803d3f8c50b7a4ea21d8807"
;;
ppc64le)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc64le-unknown-linux-gnu.tar.xz"
checksum="ba7188b2c7890e61bf58d3aa9e94c323fec375f67cf03841bbcc0f6c800fe6ad"
;;
ppc64le-musl)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc64le-unknown-linux-musl.tar.xz"
checksum="1b54ab4793ac6c9c43ee9ee45677f403a9bba9c6610e8838c96ec194bcb4f261"
;;
ppc64)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc64-unknown-linux-gnu.tar.xz"
checksum="96ce39dac948333b8321d2bc3ac70982879b185d69267f3d580df3f9c662dd0d"
;;
ppc)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc-unknown-linux-gnu.tar.xz"
checksum="c7aa415b64b046626003fcafc76da90373adc8fc748f065fa8385dc19d3b3a2a"
;;
*) broken="cargo bootstrap binaries unavailable for ${XBPS_TARGET_MACHINE}";;
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] {rust,cargo}-bootstrap: hardcode platform triplets
2023-02-06 12:36 [PR PATCH] {rust,cargo}-bootstrap: hardcode platform triplets tranzystorek-io
@ 2023-02-06 12:42 ` tranzystorek-io
2023-02-06 12:47 ` tranzystorek-io
2023-02-07 8:01 ` [PR PATCH] [Merged]: " classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: tranzystorek-io @ 2023-02-06 12:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1392 bytes --]
There is an updated pull request by tranzystorek-io against master on the void-packages repository
https://github.com/tranzystorek-io/void-packages hardcpode-triplets
https://github.com/void-linux/void-packages/pull/42109
{rust,cargo}-bootstrap: hardcode platform triplets
- rust-boostrap: hardcode platform triplets
- cargo-bootstrap: hardcode platform triplets
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- 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/42109.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hardcpode-triplets-42109.patch --]
[-- Type: text/x-diff, Size: 5484 bytes --]
From 2bdbc300694870c078659dc202ce6865ce9e84ba Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 6 Feb 2023 13:33:53 +0100
Subject: [PATCH 1/2] rust-boostrap: hardcode platform triplets
---
srcpkgs/rust-bootstrap/template | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 23f147c9fcb9..0187dfb195cf 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -24,42 +24,61 @@ case "$XBPS_TARGET_MACHINE" in
*) _bootstrap_url="https://repo-default.voidlinux.org/distfiles";;
esac
-distfiles="
- ${_bootstrap_url}/rustc-${version}-${RUST_TARGET}.tar.xz
- ${_bootstrap_url}/rust-std-${version}-${RUST_TARGET}.tar.xz"
-
+# hardcode platform triplets
+# because this info isn't avaialble here without hacky workarounds
case "$XBPS_TARGET_MACHINE" in
i686)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-i686-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-i686-unknown-linux-gnu.tar.xz"
checksum="
3d604e150c469461a64c17b6d26f96a5a3d6975246c92cd13ee9bc6e4df0aaeb
c80c57df63517d6171c061e6c095b794593172a3abefa9b4202992706bda12e5"
;;
x86_64)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-gnu.tar.xz"
checksum="
1f5756a03119853b53358018c5b1592940a2354c3c9f84ee7faf684e3478f8f0
6ace34bcbba9557aa2fc3a0515c3da4a83ca24d7d45506c5e1b32f589fa38a8b"
;;
x86_64-musl)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-musl.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-musl.tar.xz"
checksum="
5177d749b5dcc74596e314b73c5f3f3eabed8b3e207f812f229fbf0682c162ae
29af13a882abbe797fadd43afcb75bce2e2304438db9e21a3e64a2e9100501fb"
;;
ppc64le)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc64le-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc64le-unknown-linux-gnu.tar.xz"
checksum="
11630fc51fffe722e52f649357b5948c24b5305cfb61a8114527234e054451c4
ef697469b2a3ea8897f49b70e3be0c7aaca3f26fd3234812113e2e85cafac738"
;;
ppc64le-musl)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc64le-unknown-linux-musl.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc64le-unknown-linux-musl.tar.xz"
checksum="
9ae19e0cdb883aa67dc3e4ef7afca88f99c8c5d176ed9175e2f7652122c7d1d8
825b8f680d9e6e3d6b1451586bb09efb0c1f7d844d6874738e040cf3d6b20663"
;;
ppc64)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc64-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc64-unknown-linux-gnu.tar.xz"
checksum="
aae6418c71986a7f4ab7c7ab66d4f97531f0bdab50f14985c9403e2cff443de7
96485965f0a2dec274679cafbe4d39bd9e7c728824a6c5504f164ec9d5f57384"
;;
ppc)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc-unknown-linux-gnu.tar.xz"
checksum="
5f4de96bff2937fc0a64a216604c7af765af94460a1f283330eddc610d91271b
6b29ebec4cd705760db634717cf6df68a9a377d52c25def30f5a2e2641a83279"
From 005cb0ee4d3e52fe81ed55bb791e277f36af1ae2 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 6 Feb 2023 13:34:26 +0100
Subject: [PATCH 2/2] cargo-bootstrap: hardcode platform triplets
---
srcpkgs/cargo-bootstrap/template | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index 4e39b797a035..9da646a63ade 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -23,28 +23,35 @@ case "$XBPS_TARGET_MACHINE" in
*) _bootstrap_url="https://repo-default.voidlinux.org/distfiles" ;;
esac
-distfiles="${_bootstrap_url}/cargo-${version}-${RUST_TARGET}.tar.xz"
-
+# hardcode platform triplets
+# because this info isn't avaialble here without hacky workarounds
case "$XBPS_TARGET_MACHINE" in
i686)
+ distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz"
checksum="e2e20a16f5db52cd6b773c94225b03880743544ff2f317dd857cf0dceac6ab57"
;;
x86_64)
+ distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
checksum="21434d83a30ad3fa4e4831487c5574a20b07dd57d213b26e1246290c57d4ec41"
;;
x86_64-musl)
+ distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
checksum="01d06176fd894b9299ed4f5b78e87d78a9a25b9ba803d3f8c50b7a4ea21d8807"
;;
ppc64le)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc64le-unknown-linux-gnu.tar.xz"
checksum="ba7188b2c7890e61bf58d3aa9e94c323fec375f67cf03841bbcc0f6c800fe6ad"
;;
ppc64le-musl)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc64le-unknown-linux-musl.tar.xz"
checksum="1b54ab4793ac6c9c43ee9ee45677f403a9bba9c6610e8838c96ec194bcb4f261"
;;
ppc64)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc64-unknown-linux-gnu.tar.xz"
checksum="96ce39dac948333b8321d2bc3ac70982879b185d69267f3d580df3f9c662dd0d"
;;
ppc)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc-unknown-linux-gnu.tar.xz"
checksum="c7aa415b64b046626003fcafc76da90373adc8fc748f065fa8385dc19d3b3a2a"
;;
*) broken="cargo bootstrap binaries unavailable for ${XBPS_TARGET_MACHINE}";;
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Updated] {rust,cargo}-bootstrap: hardcode platform triplets
2023-02-06 12:36 [PR PATCH] {rust,cargo}-bootstrap: hardcode platform triplets tranzystorek-io
2023-02-06 12:42 ` [PR PATCH] [Updated] " tranzystorek-io
@ 2023-02-06 12:47 ` tranzystorek-io
2023-02-07 8:01 ` [PR PATCH] [Merged]: " classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: tranzystorek-io @ 2023-02-06 12:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1409 bytes --]
There is an updated pull request by tranzystorek-io against master on the void-packages repository
https://github.com/tranzystorek-io/void-packages hardcpode-triplets
https://github.com/void-linux/void-packages/pull/42109
{rust,cargo}-bootstrap: hardcode platform triplets
- rust-boostrap: hardcode platform triplets
- cargo-bootstrap: hardcode platform triplets
Fixes #42100
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- 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/42109.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-hardcpode-triplets-42109.patch --]
[-- Type: text/x-diff, Size: 5470 bytes --]
From bf066baf2f033648ab1afb69fb26aeafd319b2dc Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 6 Feb 2023 13:33:53 +0100
Subject: [PATCH 1/2] rust-boostrap: hardcode platform triplets
---
srcpkgs/rust-bootstrap/template | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 23f147c9fcb9..539a4097ef3c 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -24,42 +24,61 @@ case "$XBPS_TARGET_MACHINE" in
*) _bootstrap_url="https://repo-default.voidlinux.org/distfiles";;
esac
-distfiles="
- ${_bootstrap_url}/rustc-${version}-${RUST_TARGET}.tar.xz
- ${_bootstrap_url}/rust-std-${version}-${RUST_TARGET}.tar.xz"
-
+# hardcode platform triplets
+# because this info isn't avaialble here without hacky workarounds
case "$XBPS_TARGET_MACHINE" in
i686)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-i686-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-i686-unknown-linux-gnu.tar.xz"
checksum="
3d604e150c469461a64c17b6d26f96a5a3d6975246c92cd13ee9bc6e4df0aaeb
c80c57df63517d6171c061e6c095b794593172a3abefa9b4202992706bda12e5"
;;
x86_64)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-gnu.tar.xz"
checksum="
1f5756a03119853b53358018c5b1592940a2354c3c9f84ee7faf684e3478f8f0
6ace34bcbba9557aa2fc3a0515c3da4a83ca24d7d45506c5e1b32f589fa38a8b"
;;
x86_64-musl)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-x86_64-unknown-linux-musl.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-x86_64-unknown-linux-musl.tar.xz"
checksum="
5177d749b5dcc74596e314b73c5f3f3eabed8b3e207f812f229fbf0682c162ae
29af13a882abbe797fadd43afcb75bce2e2304438db9e21a3e64a2e9100501fb"
;;
ppc64le)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc64le-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc64le-unknown-linux-gnu.tar.xz"
checksum="
11630fc51fffe722e52f649357b5948c24b5305cfb61a8114527234e054451c4
ef697469b2a3ea8897f49b70e3be0c7aaca3f26fd3234812113e2e85cafac738"
;;
ppc64le-musl)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc64le-unknown-linux-musl.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc64le-unknown-linux-musl.tar.xz"
checksum="
9ae19e0cdb883aa67dc3e4ef7afca88f99c8c5d176ed9175e2f7652122c7d1d8
825b8f680d9e6e3d6b1451586bb09efb0c1f7d844d6874738e040cf3d6b20663"
;;
ppc64)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc64-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc64-unknown-linux-gnu.tar.xz"
checksum="
aae6418c71986a7f4ab7c7ab66d4f97531f0bdab50f14985c9403e2cff443de7
96485965f0a2dec274679cafbe4d39bd9e7c728824a6c5504f164ec9d5f57384"
;;
ppc)
+ distfiles="
+ ${_bootstrap_url}/rustc-${version}-powerpc-unknown-linux-gnu.tar.xz
+ ${_bootstrap_url}/rust-std-${version}-powerpc-unknown-linux-gnu.tar.xz"
checksum="
5f4de96bff2937fc0a64a216604c7af765af94460a1f283330eddc610d91271b
6b29ebec4cd705760db634717cf6df68a9a377d52c25def30f5a2e2641a83279"
From d5d4603116ab10f49b7cb967defbd76d0f488667 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 6 Feb 2023 13:34:26 +0100
Subject: [PATCH 2/2] cargo-bootstrap: hardcode platform triplets
---
srcpkgs/cargo-bootstrap/template | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index 4e39b797a035..9da646a63ade 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -23,28 +23,35 @@ case "$XBPS_TARGET_MACHINE" in
*) _bootstrap_url="https://repo-default.voidlinux.org/distfiles" ;;
esac
-distfiles="${_bootstrap_url}/cargo-${version}-${RUST_TARGET}.tar.xz"
-
+# hardcode platform triplets
+# because this info isn't avaialble here without hacky workarounds
case "$XBPS_TARGET_MACHINE" in
i686)
+ distfiles="${_bootstrap_url}/cargo-${version}-i686-unknown-linux-gnu.tar.xz"
checksum="e2e20a16f5db52cd6b773c94225b03880743544ff2f317dd857cf0dceac6ab57"
;;
x86_64)
+ distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-gnu.tar.xz"
checksum="21434d83a30ad3fa4e4831487c5574a20b07dd57d213b26e1246290c57d4ec41"
;;
x86_64-musl)
+ distfiles="${_bootstrap_url}/cargo-${version}-x86_64-unknown-linux-musl.tar.xz"
checksum="01d06176fd894b9299ed4f5b78e87d78a9a25b9ba803d3f8c50b7a4ea21d8807"
;;
ppc64le)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc64le-unknown-linux-gnu.tar.xz"
checksum="ba7188b2c7890e61bf58d3aa9e94c323fec375f67cf03841bbcc0f6c800fe6ad"
;;
ppc64le-musl)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc64le-unknown-linux-musl.tar.xz"
checksum="1b54ab4793ac6c9c43ee9ee45677f403a9bba9c6610e8838c96ec194bcb4f261"
;;
ppc64)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc64-unknown-linux-gnu.tar.xz"
checksum="96ce39dac948333b8321d2bc3ac70982879b185d69267f3d580df3f9c662dd0d"
;;
ppc)
+ distfiles="${_bootstrap_url}/cargo-${version}-powerpc-unknown-linux-gnu.tar.xz"
checksum="c7aa415b64b046626003fcafc76da90373adc8fc748f065fa8385dc19d3b3a2a"
;;
*) broken="cargo bootstrap binaries unavailable for ${XBPS_TARGET_MACHINE}";;
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PR PATCH] [Merged]: {rust,cargo}-bootstrap: hardcode platform triplets
2023-02-06 12:36 [PR PATCH] {rust,cargo}-bootstrap: hardcode platform triplets tranzystorek-io
2023-02-06 12:42 ` [PR PATCH] [Updated] " tranzystorek-io
2023-02-06 12:47 ` tranzystorek-io
@ 2023-02-07 8:01 ` classabbyamp
2 siblings, 0 replies; 4+ messages in thread
From: classabbyamp @ 2023-02-07 8:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1226 bytes --]
There's a merged pull request on the void-packages repository
{rust,cargo}-bootstrap: hardcode platform triplets
https://github.com/void-linux/void-packages/pull/42109
Description:
- rust-boostrap: hardcode platform triplets
- cargo-bootstrap: hardcode platform triplets
Fixes #42100
<!-- 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 [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-02-07 8:01 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-06 12:36 [PR PATCH] {rust,cargo}-bootstrap: hardcode platform triplets tranzystorek-io
2023-02-06 12:42 ` [PR PATCH] [Updated] " tranzystorek-io
2023-02-06 12:47 ` tranzystorek-io
2023-02-07 8:01 ` [PR PATCH] [Merged]: " classabbyamp
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).