Skip to content

Commit b163a89

Browse files
committed
rust-source, rust-snapshot: simplify as well
* move common stuff from rust-source to rust.inc and from rust-snapshot to rust-target.inc * 1.34.2 checksums were changed because unified SRC_URI is using tar.xz for this version as well (instead of tar.gz used before here) Signed-off-by: Martin Jansa <[email protected]>
1 parent c90c9b0 commit b163a89

21 files changed

+49
-152
lines changed
Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
1+
require rust-snapshot.inc
2+
13
## This is information on the rust-snapshot (binary) used to build our current release.
24
## snapshot info is taken from rust/src/stage0.txt
35
## TODO: find a way to add additional SRC_URIs based on the contents of an
46
## earlier SRC_URI.
57
RS_VERSION = "1.33.0"
6-
7-
RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
8-
RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
98
CARGO_VERSION = "0.34.0"
10-
CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
11-
12-
SRC_URI += " \
13-
https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.gz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
14-
https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.gz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
15-
https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.gz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
16-
"
179

1810
# TODO: Add hashes for other architecture toolchains as well. Make a script?
19-
SRC_URI[rustc-snapshot-x86_64.md5sum] = "c1ec989c1965dce754dda1e54274a68c"
20-
SRC_URI[rustc-snapshot-x86_64.sha256sum] = "54a342f718b712d8a17fd7878ebd37d22a82ebc70b59c421168cd4153fd04c2b"
21-
SRC_URI[rust-std-snapshot-x86_64.md5sum] = "d573c5bd3a965c973734c1606968a91e"
22-
SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "661c2ba717ae1502f002b4c6e7aeb8941685c7ea8fe7ac26ed9ede26f615b7af"
23-
SRC_URI[cargo-snapshot-x86_64.md5sum] = "de0e635afa9bf495cefecea476bfce36"
24-
SRC_URI[cargo-snapshot-x86_64.sha256sum] = "4795ae5ca3bb8c7c83ca338676bb02b670efa1eb474e346284b629dc872bcce8"
11+
SRC_URI[rustc-snapshot-x86_64.md5sum] = "bd776f3721f1b86d2f52bedcf25c8a9b"
12+
SRC_URI[rustc-snapshot-x86_64.sha256sum] = "57c5ced1a826d34f26e50adf041528dd0000f2a59e8be32d2359386843382ce1"
13+
SRC_URI[rust-std-snapshot-x86_64.md5sum] = "4f9f3be1f62b1e392efd100602654747"
14+
SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "6f20343ed73faf5fdfc423bec38a9bb1910a0a962af6f2dddd7184407543ed0e"
15+
SRC_URI[cargo-snapshot-x86_64.md5sum] = "ead4551e9fd773a3f212ac6a49c4c784"
16+
SRC_URI[cargo-snapshot-x86_64.sha256sum] = "1730c8ebcacc1327eb28b328cb9f5a2c612bb3d9efff9c350647adf19f304e15"

recipes-devtools/rust/rust-snapshot-1.36.0.inc

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1+
require rust-snapshot.inc
2+
13
## This is information on the rust-snapshot (binary) used to build our current release.
24
## snapshot info is taken from rust/src/stage0.txt
35
## TODO: find a way to add additional SRC_URIs based on the contents of an
46
## earlier SRC_URI.
57
RS_VERSION = "1.35.0"
6-
7-
RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
8-
RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
98
CARGO_VERSION = "0.36.0"
10-
CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
11-
12-
SRC_URI += " \
13-
https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
14-
https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
15-
https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
16-
"
179

1810
# TODO: Add hashes for other architecture toolchains as well. Make a script?
1911
SRC_URI[rustc-snapshot-x86_64.md5sum] = "47ea78f6b3f68e30f24b9c94e465d6bd"

recipes-devtools/rust/rust-snapshot-1.37.0.inc

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1+
require rust-snapshot.inc
2+
13
## This is information on the rust-snapshot (binary) used to build our current release.
24
## snapshot info is taken from rust/src/stage0.txt
35
## TODO: find a way to add additional SRC_URIs based on the contents of an
46
## earlier SRC_URI.
57
RS_VERSION = "1.36.0"
6-
7-
RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
8-
RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
98
CARGO_VERSION = "0.37.0"
10-
CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
11-
12-
SRC_URI += " \
13-
https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
14-
https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
15-
https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
16-
"
179

1810
# TODO: Add hashes for other architecture toolchains as well. Make a script?
1911
SRC_URI[rustc-snapshot-x86_64.md5sum] = "ec27794c94cc1df1a0a69f7244a09176"

recipes-devtools/rust/rust-snapshot-1.39.0.inc

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1+
require rust-snapshot.inc
2+
13
## This is information on the rust-snapshot (binary) used to build our current release.
24
## snapshot info is taken from rust/src/stage0.txt
35
## TODO: find a way to add additional SRC_URIs based on the contents of an
46
## earlier SRC_URI.
57
RS_VERSION = "1.38.0"
6-
7-
RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
8-
RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
98
CARGO_VERSION = "0.39.0"
10-
CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
11-
12-
SRC_URI += " \
13-
https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
14-
https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
15-
https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
16-
"
179

1810
# TODO: Add hashes for other architecture toolchains as well. Make a script?
1911
SRC_URI[rustc-snapshot-x86_64.md5sum] = "53278262a3996982cd68730db7cb1efd"

recipes-devtools/rust/rust-snapshot-1.40.0.inc

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1+
require rust-snapshot.inc
2+
13
## This is information on the rust-snapshot (binary) used to build our current release.
24
## snapshot info is taken from rust/src/stage0.txt
35
## TODO: find a way to add additional SRC_URIs based on the contents of an
46
## earlier SRC_URI.
57
RS_VERSION = "1.39.0"
6-
7-
RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
8-
RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
98
CARGO_VERSION = "0.40.0"
10-
CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
11-
12-
SRC_URI += " \
13-
https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
14-
https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
15-
https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
16-
"
179

1810
# TODO: Add hashes for other architecture toolchains as well. Make a script?
1911
SRC_URI[rustc-snapshot-x86_64.md5sum] = "aa10585498675e44be219d3644c15853"

recipes-devtools/rust/rust-snapshot-1.41.0.inc

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1+
require rust-snapshot.inc
2+
13
## This is information on the rust-snapshot (binary) used to build our current release.
24
## snapshot info is taken from rust/src/stage0.txt
35
## TODO: find a way to add additional SRC_URIs based on the contents of an
46
## earlier SRC_URI.
57
RS_VERSION = "1.40.0"
6-
7-
RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
8-
RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
98
CARGO_VERSION = "0.41.0"
10-
CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
11-
12-
SRC_URI += " \
13-
https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
14-
https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
15-
https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
16-
"
179

1810
# TODO: Add hashes for other architecture toolchains as well. Make a script?
1911
SRC_URI[rustc-snapshot-x86_64.md5sum] = "5c62bca8ce4beb9b15e42fb8b9690935"

recipes-devtools/rust/rust-snapshot-1.43.0.inc

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1+
require rust-snapshot.inc
2+
13
## This is information on the rust-snapshot (binary) used to build our current release.
24
## snapshot info is taken from rust/src/stage0.txt
35
## TODO: find a way to add additional SRC_URIs based on the contents of an
46
## earlier SRC_URI.
57
RS_VERSION = "1.43.1"
6-
7-
RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
8-
RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
98
CARGO_VERSION = "0.43.0"
10-
CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
11-
12-
SRC_URI += " \
13-
https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
14-
https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
15-
https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
16-
"
179

1810
# TODO: Add hashes for other architecture toolchains as well. Make a script?
1911
SRC_URI[rustc-snapshot-x86_64.sha256sum] = "a18b89572ff2e55eb9e0428efcdb60eacd82fe28c4d825d169b0ffc9e3c55ceb"

recipes-devtools/rust/rust-snapshot-1.46.0.inc

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1+
require rust-snapshot.inc
2+
13
## This is information on the rust-snapshot (binary) used to build our current release.
24
## snapshot info is taken from rust/src/stage0.txt
35
## TODO: find a way to add additional SRC_URIs based on the contents of an
46
## earlier SRC_URI.
57
RS_VERSION = "1.45.2"
6-
7-
RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
8-
RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
98
CARGO_VERSION = "0.46.1"
10-
CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
11-
12-
SRC_URI += " \
13-
https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
14-
https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
15-
https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
16-
"
179

1810
# TODO: Add hashes for other architecture toolchains as well. Make a script?
1911
SRC_URI[rust-std-snapshot-x86_64.md5sum] = "cb78b0da8ded02b9b80b58d608b58ef8"

recipes-devtools/rust/rust-snapshot-1.47.0.inc

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
1+
require rust-snapshot.inc
2+
13
## This is information on the rust-snapshot (binary) used to build our current release.
24
## snapshot info is taken from rust/src/stage0.txt
35
## TODO: find a way to add additional SRC_URIs based on the contents of an
46
## earlier SRC_URI.
57
RS_VERSION = "1.46.0"
6-
7-
RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
8-
RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
98
CARGO_VERSION = "0.47.0"
10-
CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
11-
12-
SRC_URI += " \
13-
https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
14-
https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
15-
https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
16-
"
179

1810
# TODO: Add hashes for other architecture toolchains as well. Make a script?
1911
SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "e631d80cb03539769c041ee4566e94e36a271d4b3cdd149e1447d1f77fda979c"
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
SRC_URI += " \
2+
https://static.rust-lang.org/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
3+
https://static.rust-lang.org/dist/${RUSTC_SNAPSHOT}.tar.xz;name=rustc-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
4+
https://static.rust-lang.org/dist/${CARGO_SNAPSHOT}.tar.xz;name=cargo-snapshot-${BUILD_ARCH};subdir=rust-snapshot-components \
5+
"
6+
7+
RUST_STD_SNAPSHOT = "rust-std-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
8+
RUSTC_SNAPSHOT = "rustc-${RS_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
9+
CARGO_SNAPSHOT = "cargo-${CARGO_VERSION}-${BUILD_ARCH}-unknown-linux-gnu"
Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.gz;name=rust"
1+
require rust-source.inc
22

3-
SRC_URI[rust.md5sum] = "7c85e6a60dda740295f7e004a1fb15e1"
4-
SRC_URI[rust.sha256sum] = "c69a4a85a1c464368597df8878cb9e1121aae93e215616d45ad7d23af3052f56"
5-
6-
# later versions of rust change the directory that they unextract to
7-
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
8-
# set this as our default
9-
S = "${RUSTSRC}"
3+
SRC_URI[rust.md5sum] = "2f3b962aba2eefd105e7df074ef9e99e"
4+
SRC_URI[rust.sha256sum] = "2b3b3a5462aa31d07f39721af73ef394803ceae3472e2470f28b7ee0b12e38ef"
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
1+
require rust-source.inc
22

33
SRC_URI[rust.md5sum] = "78ffc0b029aaed216b45c3fe24747d46"
44
SRC_URI[rust.sha256sum] = "f51645b9f787af4a5d94db17f6af39db0c55980ed24fe366cad55b57900f8f2d"
5-
6-
# later versions of rust change the directory that they unextract to
7-
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
8-
# set this as our default
9-
S = "${RUSTSRC}"
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
1+
require rust-source.inc
22

33
SRC_URI[rust.md5sum] = "ee6300b1d7e5767115492915c4c0d8ef"
44
SRC_URI[rust.sha256sum] = "10abffac50a729cf74cef6dd03193a2f4647541bd19ee9281be9e5b12ca8cdfd"
5-
6-
# later versions of rust change the directory that they unextract to
7-
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
8-
# set this as our default
9-
S = "${RUSTSRC}"
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
1+
require rust-source.inc
22

33
SRC_URI[rust.md5sum] = "ee76b165cd95ef420765bfb568adb450"
44
SRC_URI[rust.sha256sum] = "4b0dbb356070687a606034f71dc032b783bbf8b5d3f9fff39f2c1fbc4f171c29"
5-
6-
# later versions of rust change the directory that they unextract to
7-
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
8-
# set this as our default
9-
S = "${RUSTSRC}"
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
1+
require rust-source.inc
22

33
SRC_URI[rust.md5sum] = "1725f67a1d92ab843a71fbbefef06db9"
44
SRC_URI[rust.sha256sum] = "6e2aa3a91697f4b225c6b394cbae6b97666f061dba491f666a5281698fe2aace"
5-
6-
# later versions of rust change the directory that they unextract to
7-
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
8-
# set this as our default
9-
S = "${RUSTSRC}"
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
1+
require rust-source.inc
22

33
SRC_URI[rust.md5sum] = "e8c9d1d39ceb0dd43ee0100d0f019da4"
44
SRC_URI[rust.sha256sum] = "38d6742e5c4c98a835de5d6e12a209e442fb3078a03b2c01bab6ea7afb25be6f"
5-
6-
# later versions of rust change the directory that they unextract to
7-
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
8-
# set this as our default
9-
S = "${RUSTSRC}"
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
1+
require rust-source.inc
22

33
SRC_URI[rust.sha256sum] = "d0899933840369f07394b211cb0b53a5cd4634907633f0bee541133c8b75e309"
4-
5-
# later versions of rust change the directory that they unextract to
6-
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
7-
# set this as our default
8-
S = "${RUSTSRC}"
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
1+
require rust-source.inc
22

33
SRC_URI[rust.md5sum] = "4e3a58429c20e45385e592b0975698dc"
44
SRC_URI[rust.sha256sum] = "865dae1290a205f16ded8818c6a0254cc32862985fc250a602a70285b7d92b82"
5-
6-
# later versions of rust change the directory that they unextract to
7-
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
8-
# set this as our default
9-
S = "${RUSTSRC}"
Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
1+
require rust-source.inc
22

33
SRC_URI[rust.sha256sum] = "ec2c81d2d34890486094a6407589be96161e4e301c238332d32c6dbae4f38ea2"
4-
5-
# later versions of rust change the directory that they unextract to
6-
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"
7-
# set this as our default
8-
S = "${RUSTSRC}"

recipes-devtools/rust/rust-source.inc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
SRC_URI += "https://static.rust-lang.org/dist/rustc-${PV}-src.tar.xz;name=rust"
2+
3+
RUSTSRC = "${WORKDIR}/rustc-${PV}-src"

recipes-devtools/rust/rust.inc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ inherit cargo_common
1010
DEPENDS += "file-native python3-native"
1111
DEPENDS_append_class-native = " rust-llvm-native"
1212

13+
S = "${RUSTSRC}"
14+
1315
# We generate local targets, and need to be able to locate them
1416
export RUST_TARGET_PATH="${WORKDIR}/targets/"
1517

0 commit comments

Comments
 (0)