Skip to content

Commit d621f4f

Browse files
committed
updpatch: rust 1:1.79.0-3
- Add back previously removed pin-cc-to-1-0-77.patch(and fix rotten). - Remove this patch once rust-lang/rust#122504 land in 1.80 - This package should be built from main branch and after wasi-libc 1:0+374+9e8c5423-2 is built.
1 parent 4826a8a commit d621f4f

File tree

2 files changed

+51
-5
lines changed

2 files changed

+51
-5
lines changed

rust/pin-cc-to-1-0-77.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
2+
index c7a513d0890..a9fce106106 100644
3+
--- a/src/bootstrap/Cargo.toml
4+
+++ b/src/bootstrap/Cargo.toml
5+
@@ -36,7 +36,7 @@ test = false
6+
# Most of the time updating these dependencies requires modifications
7+
# to the bootstrap codebase; otherwise, some targets will fail. That's
8+
# why these dependencies are explicitly pinned.
9+
-cc = "=1.0.73"
10+
+cc = { version = "=1.0.77", path = "../../../cc-1.0.77" }
11+
cmake = "=0.1.48"
12+
13+
build_helper = { path = "../tools/build_helper" }

rust/riscv64.patch

Lines changed: 38 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,49 @@
88
rust-musl
99
rust-wasm
1010
rust-src
11-
@@ -37,8 +36,6 @@ depends=(
11+
@@ -35,10 +34,9 @@ depends=(
12+
zlib
13+
)
1214
makedepends=(
15+
+ git
1316
clang
1417
cmake
1518
- lib32-gcc-libs
1619
- lib32-glibc
1720
libffi
1821
lld
1922
llvm
20-
@@ -95,9 +92,8 @@ link-shared = true
23+
@@ -60,13 +58,17 @@ source=(
24+
0002-bootstrap-Change-bash-completion-dir.patch
25+
0003-compiler-Change-LLVM-targets.patch
26+
0004-compiler-Use-wasm-ld-for-wasm-targets.patch
27+
+ pin-cc-to-1-0-77.patch
28+
+ cc-1.0.77::git+https://github.com/rust-lang/cc-rs#tag=1.0.77
29+
)
30+
b2sums=('07fbb29007921cffa6fc11a928d64a43c93c14cd421aee77cf44b7ee71a67c67d9f7454f5d1b85f2d79f50dcc7048a356f4f3971ba87ebad21f53321c51808ca'
31+
'SKIP'
32+
'c1cf64e26d240fbacbe2170ad4a114e09deb8230c8c7934415c7b9cb32eb30f708694265b34f281f466c8d8ec7841bfa4895da877d2ca87a3a953a7faa40de80'
33+
'093cf81b7c5be5ef8421b4a31a56b5b28d3ecfcb2e952bfea379683f31a237142afdd1c2e45a67e29a11e8e915e80671249fdc2b5760e58702234e5b339abf4e'
34+
'c81eb7e5f4dd8225701aa379381bd377be2348f42f778e67b77118f68e92ac1fe60aab692fbcd61a02af900f9e017ea05adc7bb508ef6297dd096585e0571e5e'
35+
- '963aa64d27763f063b9fac483a870563f5a71a49ec02d17b7ca0c14dbf67064ba56028bbc45f2ee50b16eada725cb55c2aa2ab17ceadff65ba9e40cb220f7a0c')
36+
+ '963aa64d27763f063b9fac483a870563f5a71a49ec02d17b7ca0c14dbf67064ba56028bbc45f2ee50b16eada725cb55c2aa2ab17ceadff65ba9e40cb220f7a0c'
37+
+ '3cc7a30f0adf5e6fb17f02da5c3ad36201b9196408de52363c4863c6b88a95e8a70aca96dcf02535868ff79a263d6e49cc5882cf34f254069256d651f5f34c10'
38+
+ '2e585d4d0d654bfda6fbcd288fda390edb93848f17cfc11cae6f40c57c141f6c7c62c0704679787eec2be3322384376e519defc86b6fc4f047b5570ad786ef24')
39+
validpgpkeys=(
40+
108F66205EAEB0AAA8DD5E1C85AB96E6FA1BE5FE # Rust Language (Tag and Release Signing Key) <rust-key@rust-lang.org>
41+
)
42+
@@ -87,6 +89,10 @@ prepare() {
43+
# Use our wasm-ld
44+
patch -Np1 -i ../0004-compiler-Use-wasm-ld-for-wasm-targets.patch
45+
46+
+ # Bump bootstrap cc to v1.0.77, remove upon rust 1.80: https://github.com/rust-lang/rust/pull/122504
47+
+ patch -Np1 -i ../pin-cc-to-1-0-77.patch
48+
+ cd src/bootstrap && cargo update -p cc && cd -
49+
+
50+
cat >config.toml <<END
51+
# see src/bootstrap/defaults/
52+
profile = "dist"
53+
@@ -99,9 +105,8 @@ link-shared = true
2154

2255
[build]
2356
target = [
@@ -28,8 +61,8 @@
2861
+ "riscv64gc-unknown-linux-musl",
2962
"wasm32-unknown-unknown",
3063
"wasm32-wasi",
31-
]
32-
@@ -141,22 +137,18 @@ jemalloc = true
64+
"wasm32-wasip1",
65+
@@ -148,22 +153,18 @@ jemalloc = true
3366
[dist]
3467
compression-formats = ["gz"]
3568

@@ -56,7 +89,7 @@
5689

5790
[target.wasm32-unknown-unknown]
5891
sanitizers = false
59-
@@ -207,12 +199,9 @@ build() {
92+
@@ -229,12 +230,9 @@ build() {
6093

6194
# rustbuild always installs copies of the shared libraries to /usr/lib,
6295
# overwrite them with symlinks to the per-architecture versions

0 commit comments

Comments
 (0)