Skip to content

Commit

Permalink
rust: Upgrade 1.78.0->1.79.0
Browse files Browse the repository at this point in the history 
Update the patch files with rust v1.79.0.

Drop the following backported patch which is merged
with rust v1.79 upgrade.

- cross-targets-backport.patch

https://blog.rust-lang.org/2024/06/13/Rust-1.79.0.html

(From OE-Core rev: ffdba14808372501afd30d185e046719f4020e0b)

Signed-off-by: Yash Shinde <[email protected]>
Signed-off-by: Alexandre Belloni <[email protected]>
  • Loading branch information
@alexandrebelloni
Yash Shinde authored and alexandrebelloni committed Aug 26, 2024
1 parent 7c12116 commit c82a486
Show file tree
Hide file tree
Showing 12 changed files with 132 additions and 112 deletions.
2 changes: 1 addition & 1 deletion meta/conf/distro/include/tcmode-default.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ GLIBCVERSION ?= "2.40%"
LINUXLIBCVERSION ?= "6.10%"
QEMUVERSION ?= "9.0%"
GOVERSION ?= "1.22%"
RUSTVERSION ?= "1.78%"
RUSTVERSION ?= "1.79%"

PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
PREFERRED_VERSION_gcc-cross-${TARGET_ARCH} ?= "${GCCVERSION}"
Expand Down
0 meta/recipes-devtools/rust/cargo_1.78.0.bb → meta/recipes-devtools/rust/cargo_1.79.0.bb
View file
File renamed without changes.
31 changes: 0 additions & 31 deletions meta/recipes-devtools/rust/files/cross-targets-backport.patch
View file

This file was deleted.

98 changes: 75 additions & 23 deletions meta/recipes-devtools/rust/files/repro-issue-fix-with-cc-crate-hashmap.patch
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions meta/recipes-devtools/rust/files/rv32-rustix-libc-backend.patch
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions meta/recipes-devtools/rust/files/zlib-off64_t.patch
View file

Large diffs are not rendered by default.

0 ...recipes-devtools/rust/libstd-rs_1.78.0.bb → ...recipes-devtools/rust/libstd-rs_1.79.0.bb
View file
File renamed without changes.
0 ...vtools/rust/rust-cross-canadian_1.78.0.bb → ...vtools/rust/rust-cross-canadian_1.79.0.bb
View file
File renamed without changes.
0 ...recipes-devtools/rust/rust-llvm_1.78.0.bb → ...recipes-devtools/rust/rust-llvm_1.79.0.bb
View file
File renamed without changes.
78 changes: 39 additions & 39 deletions meta/recipes-devtools/rust/rust-snapshot.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,56 +4,56 @@
## The exact (previous) version that has been used is specified in the source tarball.
## The version is replicated here.

SNAPSHOT_VERSION = "1.77.0"
SNAPSHOT_VERSION = "1.78.0"

SRC_URI[cargo-snapshot-aarch64.sha256sum] = "0833e133e2b98d840c5180a3dabc49c0de9895c54055dfee92fa94d2a12196d5"
SRC_URI[clippy-snapshot-aarch64.sha256sum] = "a60b58615747ac868f4d23d711d0386685beaeb597bc2e2bb7ce49a2b4826beb"
SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "b6c551baf0cc9a32582f2362379b596f33c1bc93ae520d5648e9138de1b4b90b"
SRC_URI[rustc-snapshot-aarch64.sha256sum] = "ca7caef0b4e32f769edf4d7d596d0da9c3d562dd8233bd9068d3ba6cfe8dfe48"
SRC_URI[cargo-snapshot-aarch64.sha256sum] = "5173f84a07d4cc6b19f27eda7464999c5886232ce8e54bf61b06617635d43fb9"
SRC_URI[clippy-snapshot-aarch64.sha256sum] = "086367aa83ea8c30ce41fb6c097ae6ebdc92363fb1ce8ee9f01d44cafa625f61"
SRC_URI[rust-std-snapshot-aarch64.sha256sum] = "66cf114dcd8056a596bf169f824ff95ff1837bc065daaafdbcaa02ce92903304"
SRC_URI[rustc-snapshot-aarch64.sha256sum] = "e0450bef5537e6b0bb82872e9f837c3b3f6397cc8eba6f53211481c82426e1ce"

SRC_URI[cargo-snapshot-i686.sha256sum] = "eaf3461608760821fdf0beca8f68eaa743fc9a7fcc1725bfb143e57b815d123e"
SRC_URI[clippy-snapshot-i686.sha256sum] = "b4998f498080af2fa83d6e46921c63a05115ee8113fdbd6654b42678dbdeeeeb"
SRC_URI[rust-std-snapshot-i686.sha256sum] = "332b4652fc5f37379ff8f820a6affea6500350d0669f72cf4fdec9b8900d66ea"
SRC_URI[rustc-snapshot-i686.sha256sum] = "1d15d1558d1c97072c1ecfac9f4466022c4afa482e06efdb5cf4eeebe940a186"
SRC_URI[cargo-snapshot-i686.sha256sum] = "472230d0a04c6a2db80671549cb970176299817883dafbffb15c993f5aeaa909"
SRC_URI[clippy-snapshot-i686.sha256sum] = "1abc63d39850194580c22f998ff14aade2601f7cfc2465cf68828dcfc9d5536d"
SRC_URI[rust-std-snapshot-i686.sha256sum] = "9e5e02311853354c1540e1b4da6c1686616cea9d3a233c033023f36d950977c0"
SRC_URI[rustc-snapshot-i686.sha256sum] = "8ba9c213e5daaf08a13c5787a4ea0d7ae8d1e7004126de2b8dc6a6dcd798becd"

SRC_URI[cargo-snapshot-loongarch64.sha256sum] = "3952bf1766b7ef04218ab990066abe7598af2dc6fd6ce417569637ee919990bd"
SRC_URI[clippy-snapshot-loongarch64.sha256sum] = "b6bf201285610ff01e262c27f3e663200d36839ce5176b5cfdf7bd1c02a139b3"
SRC_URI[rust-std-snapshot-loongarch64.sha256sum] = "bd5a72c959f437b8245df6aa59171d4678ba7a47b963ec0552032a88247123ce"
SRC_URI[rustc-snapshot-loongarch64.sha256sum] = "f629ac5186026fe46b8656b0c91cf6ae8059c7f4e0c62c5d73e00aac51c0d1d4"
SRC_URI[cargo-snapshot-loongarch64.sha256sum] = "fabe8c461fb87eff8bdf7845fca7051c5dc6e46da4dc6b3023c90efc7d7bd918"
SRC_URI[clippy-snapshot-loongarch64.sha256sum] = "d9366b69bd41673bccd7617c2f3fe6a1cdd478fda407c7d9fda0021e33deb825"
SRC_URI[rust-std-snapshot-loongarch64.sha256sum] = "9f5dc7bfd8602a594157d04c480fb74804a3cdd9b77f46202e289a546af7c846"
SRC_URI[rustc-snapshot-loongarch64.sha256sum] = "9f19f781cdfa51f5e8b540602a6a07d45ab5f2e063a86af6177625ecf9d79358"

SRC_URI[cargo-snapshot-powerpc.sha256sum] = "daf08e82bb631650e4ed44cced4a943ef368fa89ab4a098ee11e6dac0f5b2f55"
SRC_URI[clippy-snapshot-powerpc.sha256sum] = "8e092ec41ad2edf8ebfe06cf476638ff46a77279d3b902461a0627cc5fc059f8"
SRC_URI[rust-std-snapshot-powerpc.sha256sum] = "6468f16f8430c7b34d3bdfb11afd6843531859b69258f3ccc46f304499603fbe"
SRC_URI[rustc-snapshot-powerpc.sha256sum] = "2017726dcd5ffef41fc63061ace7292fb2311d42b3130288d7706fbcfc1497e2"
SRC_URI[cargo-snapshot-powerpc.sha256sum] = "3d73d16f1b7c4aaf53e6d9ac6d04586c60698b0c2c793c55585b0234f75d247d"
SRC_URI[clippy-snapshot-powerpc.sha256sum] = "f9b0d7ac6bdd26b678201d068f8777df5fdc7f524602f73eff54c7e8a5844892"
SRC_URI[rust-std-snapshot-powerpc.sha256sum] = "4ac9958386c4225b14f8e6281dd64a2b00d5db32c5b336fac137c7c729df25a0"
SRC_URI[rustc-snapshot-powerpc.sha256sum] = "33bbd45416ce00f2e21073ebcef8668575a3955189c85a13172bf5f5750e00ef"

SRC_URI[cargo-snapshot-powerpc64.sha256sum] = "4a93b099561403caeb0ff7706a2def51ad3528acb4782953ef2e9a6de56eda7f"
SRC_URI[clippy-snapshot-powerpc64.sha256sum] = "eecf9d2e4a7ebff9e6719b53bb0de196edb89d2faa3a395934b4156b11d0a23d"
SRC_URI[rust-std-snapshot-powerpc64.sha256sum] = "7cc586154e92305d5f89276107e1175fdf1f2cd95739aa6926cab4774c9ffe5d"
SRC_URI[rustc-snapshot-powerpc64.sha256sum] = "60d1b3cc02e48489638bfd976c1c979a40c92452cc93d0fc4ff4c16ba64c8f86"
SRC_URI[cargo-snapshot-powerpc64.sha256sum] = "271e121aa1324d37d2bd650217256a792ed387af4b14df0b2757ba22dab50ee5"
SRC_URI[clippy-snapshot-powerpc64.sha256sum] = "53294b52155bb320570dd125e58b07ee3a0cb35e47a33716b3561d1751ccc538"
SRC_URI[rust-std-snapshot-powerpc64.sha256sum] = "303e3533e72099d4f0a1d5c2f31c68ef93b3a3ef8af5d36773eac394f920fb22"
SRC_URI[rustc-snapshot-powerpc64.sha256sum] = "338299628336aa97e6d2f30b5d3c4beaf78038f1e1347a378cbbf80d02a461ea"

SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "a4c4421fe3037522908de081cc0577baaf75e7b8c532616ce79dd032a42c60e8"
SRC_URI[clippy-snapshot-powerpc64le.sha256sum] = "9b46217dc6cf5c10cd65d343802c2da0f6f3a65d13ca10730258de9a74e1b7f1"
SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "deffffaaa58b9464719fe4609ccad5db14e482aa48c3dcdb0a8aea62bb82332c"
SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "381bd57fd07e6f93e56893091b8aaf0d097b9957d655c2dfbaeff35b2305ea29"
SRC_URI[cargo-snapshot-powerpc64le.sha256sum] = "b58d7e61fb36295ebd0a09242e292c7bc4fa24fc189aa285b6e266263f356316"
SRC_URI[clippy-snapshot-powerpc64le.sha256sum] = "5b2b621b79a7635d5670bc17d992f6a0bff0e153b6629fdd501a08cf0df7b126"
SRC_URI[rust-std-snapshot-powerpc64le.sha256sum] = "117a01afab9d4c6e39bc32b57f8a4b9ad8d693869dde0c52fa51a6ec05eaab8b"
SRC_URI[rustc-snapshot-powerpc64le.sha256sum] = "45ba3091f9f17abfb01d0c03c87e8de33f0a210aefbdb007905dbf6cfba8590d"

SRC_URI[cargo-snapshot-riscv64gc.sha256sum] = "20d5fe02ccfd86220d0fb5f170c44bc05af4bfdd8e9060f2e084b0af5faf53a7"
SRC_URI[clippy-snapshot-riscv64gc.sha256sum] = "d1373618e6c4b702a4d00089f26ee048969e3b3bea0116bae3a9ba75508c0d98"
SRC_URI[rust-std-snapshot-riscv64gc.sha256sum] = "94443ac959cacd1bab96af3c690794c3ac4e05780c09dacdc85073134bf70c69"
SRC_URI[rustc-snapshot-riscv64gc.sha256sum] = "186d39a91756738fd5ab90acfb944c6206b30374a780600b71d98f2dc2e509cc"
SRC_URI[cargo-snapshot-riscv64gc.sha256sum] = "fc3fda5412f2b1a53c6a3fe6c0a98864d50eac8c63e9b38383085abad6487e3b"
SRC_URI[clippy-snapshot-riscv64gc.sha256sum] = "44745c59092bc449b0338ab6788eb0b2a6d5ad382224fe1ba1017931ebb6e6dc"
SRC_URI[rust-std-snapshot-riscv64gc.sha256sum] = "e5d0e1e532f4ca4656d971c4301e87cbcd571daeffd7830b1d02055f95bdaca6"
SRC_URI[rustc-snapshot-riscv64gc.sha256sum] = "6925c93e4b5b21e37b27aed7723cdd6da317eec3f06f86fb0e5be868f58ea052"

SRC_URI[cargo-snapshot-s390x.sha256sum] = "f5122b1ba1f43d40013d6f24495e1a289b3c70bfc4d09d2e5e581d9f0c051786"
SRC_URI[clippy-snapshot-s390x.sha256sum] = "9d1d789feea21bb3e4d0bf82e6bdfa67e1f33236186e6c9f0023219dd1ca2f76"
SRC_URI[rust-std-snapshot-s390x.sha256sum] = "680e6c5ea712cb713c65c8b63ec44c441d60b5dc2bb7a3031088175dee33ba0b"
SRC_URI[rustc-snapshot-s390x.sha256sum] = "b80743fb83e3f3a61f9267fde1d39709e009d8e25b85a7bc45f915c6b36fa836"
SRC_URI[cargo-snapshot-s390x.sha256sum] = "59da021df10c62786d33bc6b186a7d1114f788bebcd09f0dd323032fad2f7f5d"
SRC_URI[clippy-snapshot-s390x.sha256sum] = "1a5542ac30cbcfb15512aba2d53b30dd8835058514085067bbcf7c938c05b79e"
SRC_URI[rust-std-snapshot-s390x.sha256sum] = "aee53a0a04fb44c95b9aa6217c5483113e1f67fa595dea6fdcbbbd72826e729b"
SRC_URI[rustc-snapshot-s390x.sha256sum] = "1f458a0b3b947d78d50c67b16bb68e8528cb71d52a7021c3b1652b5f9004c40b"

SRC_URI[cargo-snapshot-x86_64.sha256sum] = "0af971f126e0307d4e4d974f0e9c33fd1c2923274b14a0861823b5a019e8faf5"
SRC_URI[clippy-snapshot-x86_64.sha256sum] = "f4bbb77674bc229b021b946dcf1d48a80d3d2fcfc7e10052cc01e2bfcc2769cd"
SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "e5fec840744c3ff63611f6801de80f5ec8e099fa8225bf46d064810a9545e9b5"
SRC_URI[rustc-snapshot-x86_64.sha256sum] = "89397dddb99733bad987e9fdc9d985a150af2e39c81766099e584d93991f5752"
SRC_URI[cargo-snapshot-x86_64.sha256sum] = "f8aacf7a101eb10dc000b8bf26de90a9d0ce678d02ccf70430ed20dd31ecec6b"
SRC_URI[clippy-snapshot-x86_64.sha256sum] = "b15184ba6078dd7976f06239a258313a96de2677b37e4c560779cf7f261c3ee5"
SRC_URI[rust-std-snapshot-x86_64.sha256sum] = "95aece42a336f237c5bac5c5d9aca051b7f0bd3e6a64fb3c5828e6d0d3af2e8c"
SRC_URI[rustc-snapshot-x86_64.sha256sum] = "3994971e5923716d54e4b574ce238f04c4e20cda03990670f7cc3f87d36e5499"

SRC_URI[rust-std-snapshot-i586.sha256sum] = "97a22f0fc78a1731b3e6795e76e94f958702a6b4c3ff5b627c63e33455c45825"
SRC_URI[rust-std-snapshot-i586.sha256sum] = "c119866af24c91108d34267e24886ad90fd8784edfdfd0d36c64013b06974f71"

SRC_URI[rust-std-snapshot-sparc64.sha256sum] = "c2df78ff30b84ed80a140820356c323ca3c707529f1caeeae37a5419c02cc7be"
SRC_URI[rust-std-snapshot-sparc64.sha256sum] = "7e158a16f733844975e65090b07706596401719bd3f5aca44da9f98fb3c11b04"

SRC_URI += " \
${RUST_DIST_SERVER}/dist/${RUST_STD_SNAPSHOT}.tar.xz;name=rust-std-snapshot-${RUST_BUILD_ARCH};subdir=rust-snapshot-components \
Expand Down
3 changes: 1 addition & 2 deletions meta/recipes-devtools/rust/rust-source.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ SRC_URI += "https://static.rust-lang.org/dist/rustc-${RUST_VERSION}-src.tar.xz;n
file://rv32-cargo-rustix-0.38.28-fix.patch;patchdir=${RUSTSRC} \
file://0001-cargo-do-not-write-host-information-into-compilation.patch;patchdir=${RUSTSRC} \
file://rustdoc-repro-issue-fix-cargo-config-for-codegenunits.patch;patchdir=${RUSTSRC} \
file://cross-targets-backport.patch;patchdir=${RUSTSRC} \
file://rust-oe-selftest.patch;patchdir=${RUSTSRC} \
file://repro-issue-fix-with-cc-crate-hashmap.patch;patchdir=${RUSTSRC} \
"
SRC_URI[rust.sha256sum] = "8065824f0255faa3901db8206e6f9423f6f8c07cec28bc6f2797c6c948310ece"
SRC_URI[rust.sha256sum] = "ab826e84b8d48ec6eda3370065034dea8c006f6a946d78a9ba12bcb50e6d3c7a"

RUSTSRC = "${WORKDIR}/rustc-${RUST_VERSION}-src"

Expand Down
0 meta/recipes-devtools/rust/rust_1.78.0.bb → meta/recipes-devtools/rust/rust_1.79.0.bb
View file
File renamed without changes.

0 comments on commit c82a486

Please sign in to comment.