From e3d9709ca65e22dd9e6d1590f7c38a6d7b12f709 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 8 Nov 2022 07:57:41 +0000 Subject: [PATCH 1/3] dev-lang: Upgrade dev-lang/rust 1.64.0 to 1.65.0 --- .../updates/2022-11-08-rust-1.65.0-update.md | 1 + .../coreos-overlay/dev-lang/rust/Manifest | 68 +++++++++---------- ...{rust-1.64.0.ebuild => rust-1.65.0.ebuild} | 0 .../coreos/base/package.accept_keywords | 4 +- ...{rust-1.64.0.ebuild => rust-1.65.0.ebuild} | 0 5 files changed, 37 insertions(+), 36 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-11-08-rust-1.65.0-update.md rename sdk_container/src/third_party/coreos-overlay/dev-lang/rust/{rust-1.64.0.ebuild => rust-1.65.0.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/virtual/rust/{rust-1.64.0.ebuild => rust-1.65.0.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-11-08-rust-1.65.0-update.md b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-11-08-rust-1.65.0-update.md new file mode 100644 index 0000000000..94be156512 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/updates/2022-11-08-rust-1.65.0-update.md @@ -0,0 +1 @@ +- Rust ([1.65.0](https://github.com/rust-lang/rust/releases/tag/1.65.0)) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest index 6e85f6547c..e73a15bb3d 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/Manifest @@ -1,34 +1,34 @@ -DIST rust-1.63.0-aarch64-unknown-linux-gnu.tar.xz 230083616 BLAKE2B 2b66b809d53cc971c9cd44435c10c4bf0faa20dcc3782b47955d0fac252c370c670f0adb59f51b6842b46277d584c5fd44b94202e57aed078480f5cb6952d815 SHA512 c9f7b885008c58f7aac0edd5b6cd0295d768215e2b26cb1f590206248d468fa78409f42f48d505080ee14e2a59dd887cfc564db5a41e91ed36d738a90961f89e -DIST rust-1.63.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B a323669f0587c9785c587ac0eac72915e421a61d2b5252c2dcc7f637176d5d425fc8cbcfa6ef848fd0d7acfa17cd430e4d42e8c03729c563dda59aa13e6d5c5b SHA512 be2e1eff9228576b66e0a0434e1edbb4525d0ef66743082afef1ef55565e312e63fed7274d01298128fda0c7ab63827d5aed90f50e184582781a4e10ee311de1 -DIST rust-1.63.0-aarch64-unknown-linux-musl.tar.xz 224541836 BLAKE2B b32b7886ddc5da3af0c6e394ecb167288897b2c44b0108e33aeabb3842ff563c769e635413b092a36246bbcf137d692e94c6ce66cccad34c7e728c4cf4af7bc2 SHA512 e462c8b94defc5ac5dfe923c3a6273c3d414cf576840d46a680a4f333bc34fea874c4ec4363c4e1891a6fe95087bf4a68bba7f316bfed9db6313be989afd7428 -DIST rust-1.63.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B ccac24e85deb6089468b763bce6cd54ec1c5ce506d10c8e84d3e8b0c9ee21946ac575a4aab5205c5a2d8328488641806a7dc1b15bd8cc48f3701630f223580f4 SHA512 9d41f34e507271e26e6ff7ce03d6a215a99971df77b246fa64b3518d70c2ec82142e96c4d0cf9641405065ec672f663316a93fe0e9183bd1e8f5af4de1ef41f1 -DIST rust-1.63.0-arm-unknown-linux-gnueabi.tar.xz 203850320 BLAKE2B 2a0f4e195d6e7ca66119b2bd45d58127b6aa305c77349c06d8ee109066ede59288ce067e222fca12f1414224a74ec9f33e7de1a18bf7b1e91e216e852e574a90 SHA512 d55ee6201bc4c3cd698396f08d4247b7578778b3c82da8ef496512e0f8cb1758009af6286230a1b26849b5f27101a242d7e04851ae41a41f7547589103f5c0ce -DIST rust-1.63.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B 26bdf2e38262d3e4b23c72f86325dd1275c08b5ccccd99c82b91a05cf800e3e6a2500bdc6d89a3582311292f6ba1ddd65b8a081b608c83adcb39faa708f8376d SHA512 0f1213cf05bbbf659103c7178f20780fa3ef807cd03417edcb901d6560411c3f96bfeeb0dcf555460675573cfb9d402fa3882d787015ecfbf83765ae9fc35325 -DIST rust-1.63.0-arm-unknown-linux-gnueabihf.tar.xz 204273564 BLAKE2B 4a3730dc3d1cc08c8a0a687328e19e7a78265eb81cc1a3312cc547bd4823951c28ab57ac87919aab346994a6f96ce9803f7429c6b1831e4fdb3a7f7f086a2a87 SHA512 d53bc819c7ca2e5fc116fec5a731d280ac701f19fd9a8707ee5e69fdc41544d3dce17f8cd61f9ad0b59a89409c9859634e5d91444a0361add69c36c3f47a379d -DIST rust-1.63.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B e71f5d6f404a408774f6246fe72596c59255ba1f1b52c4ef6fdef08da63178fefa46966370a1f4e04b95a68b119f166e01d2d2d347f9e4517908e87146a56d83 SHA512 c70a350de8d378ed8dcec42d697143e4cce18dfd176b4fbcea25e7c608ff3db51642ab1be3b13d277d7eeec5a0262aaf9c38527f7f14c02fc64f760d6438efb2 -DIST rust-1.63.0-armv7-unknown-linux-gnueabihf.tar.xz 209545116 BLAKE2B 2cb5610fc665f50505fa8b0d18b88cf79abca6a6b8503d46f76fc58b74e7d58e3b7aa1a790e7ba555b250d0f0bd48acd176ff1cf463eb7f37b34780b04b2c838 SHA512 e809ac29a9b24c82f7d950ebbad5d3c01dafba9554c55716a28e728b0218c6f8b3b7f1e31c277be3946da1a0e4228717d7a1a63db66716c19a79b2c5ac11fb92 -DIST rust-1.63.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B c6f1e717a7cb746dfe3d9b109d77bdf7cd918c2d60491d83b2d7cebf412140b9cae257df850587c16a7b1c8faa16ef029f628c6c2c7e5b6f1d088e1a03c33899 SHA512 c832521179dd7b7cda0e979bfbfe491d3a255cb47f03fe113ac1290540fdc7134ea08a2815c9ec422919579fff3db995aa0e7f72249e2d00d4790a58f1142680 -DIST rust-1.63.0-i686-unknown-linux-gnu.tar.xz 224058112 BLAKE2B 6a83fa3bd0fe2a7f0cdbf8b8c7a6662235f9690177c9ed06af7be969b08959d2c58a8689247cd61a9d9ff765e6946f2bb12b9d278a0701d4764bdf8d141dd4cf SHA512 8441267b1fb1cec3c9a2e226f6f6c5d66cdf9fa2026df272374432c501aefb515b8d21266ddee5297f8570de72c55fa5bf485c5a9790ad7687e5ad1811c72cad -DIST rust-1.63.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 5c2e92bdf15c1dbfdb2715fd4b1874a270e21bedad1c84967c4bf92a2818935dfdfc48673e3b52d991ae9557378a62a5905e8f3005f1bf12f6eb93415cc47b1c SHA512 f42f5e65f76c72f7dd6bfdbc730b3c4da50d1444df2b1282334a6a3e6cb0af175536b037c6a5f1fc4000640756e57a3176315e288fe23ba56abe8a6f4c763525 -DIST rust-1.63.0-mips-unknown-linux-gnu.tar.xz 161238712 BLAKE2B a60f7b8a190fb90e123c18fafde9fbfa6e27bedc849175351ec9871ea705c2a54eae59b5597e71e20d2e63c73065717ccb56eea59ed46d12c13ae4fe8125ae5e SHA512 dc7ec2f92bdcd52af83c71b07df0f31187b8f195e9900ba0ffa3688175cdd22e81c34ef45b5e84c2cb9b47adf990de20a2c9296b46c17cc06176c19e956923cb -DIST rust-1.63.0-mips-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 7803d7c07170d1a9af4e83add8f9b42caec19f5c8af4163dd541069f8b3f86087a09e4c3447c0faba19d1c2173c2411503856254b34d7c57320be250dd5b72ab SHA512 a9e80d1417353298656b99137a20478265458c95914c9d547bb57905ac9b654127fbf6e7a4292bfe74afd0aaae20730a126910383822d0c75b2da164bf60341e -DIST rust-1.63.0-mips64-unknown-linux-gnuabi64.tar.xz 166872588 BLAKE2B 3a052d6f4196cbf55feb173e36c22cd3316abf6081d6a94dd6a7ab3a675f447471555b721e162ca15cbc485c4571b647a9257649a1d23b69b9a0ef262827b2d7 SHA512 db23d30021d6f8a5fbec50b6dac13264e3aac003ff0604185999318b47370b4476ce9e6034ab9ab5f4fba03b393898968b8c9a698f2b71bc1f58b452b030d1c4 -DIST rust-1.63.0-mips64-unknown-linux-gnuabi64.tar.xz.asc 801 BLAKE2B f30125c52883076251a22bb8a90fdd642167ebd0688ceb8e349555491824cffbc0873526b0269419fbc6421c5976aab18f5c3bbf35b997b4afc5d48b1e080c03 SHA512 d86940292aa891f7f0fc10d14b5ee386f8481448b6ed26bd8aabf21a7341c0916b08eae0e26bcd1dcc0fad1fbc0d216a767d8eba3dcc2ed47c4bb0aab107ab80 -DIST rust-1.63.0-mipsel-unknown-linux-gnu.tar.xz 165974484 BLAKE2B 4dcbcb3e6255c9266c4476e62aa9a6d31c4ba48b9a830789d9cf245002b4fec762f86fb6713507dfac8227a4e9da32347e5ce9d029d53220f8b3037e2dcf47c5 SHA512 2fb7e3bdc925abfc8efc4ee30f19bf6eb5d5afc803332059cf855eee7ba7c6a85c578701798fd1b9f9b07a4a7b091283406ca02c797fdafc9e437b0ea85de8be -DIST rust-1.63.0-mipsel-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B c42a76a7902234490f33b520494d85c5000592cb781d97c9def132fce39f3e582cfbe6c868a7dc494ce550228ee0c4195500a17489323c22f9aecc74d4915135 SHA512 62fa9ace175d1359ae61229e6618972ff1db42b8e826113af247fccd67c4f49dd4ad4d93eefa3801a20a164332404f9fa5002c75ede2b81eb277e64d1a29396a -DIST rust-1.63.0-powerpc-unknown-linux-gnu.tar.xz 184571616 BLAKE2B 452ee709ba25db4569e4ed20f88ea4a14c8b45c85803b065b5bc6e005473c02dc745ae531b8e0c7642dbe50880dd2f9d359520a3f0fc09628327613ed706dd38 SHA512 2dd3ab750044501e882442e54fc78fe73f36758458c6107df7afd55f8333c01a2e69bde181ca1bf3a1529a3a2bf616d4f69708081c494cc1781be5fd2a58df29 -DIST rust-1.63.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 13796a48f4ae628c2242ce4632ebdf4106899aa0713b469e4ad4457f0bad23638626bdf6de6a2f6d1d84b8408872c5a4cc97ae4fa0409458d8bec6eb43adf9a5 SHA512 813601cbe547add62345d4a9ed1a31e364310724c2bddf9f76404095b9fa1ab3c33f9480953d22136635afc8d6f7d4a9df2839f2e3d9d5f74a6594ae3d7f9537 -DIST rust-1.63.0-powerpc64-unknown-linux-gnu.tar.xz 192446060 BLAKE2B 28a6c8a94caab7d23d203e55ad1ad1b689f07ea9d4bdb0a618833b36378ea731ca85f906c8fe0de2727001471fef9b30b8f12a241d9cd257851b2b0a8a94f15b SHA512 42a39558352c1cbdf7c9e9fa1aecae160b43e1bf74ace0df844d95bd43743642be7107bbb60a574de7219da355cf64939509d4f028f32d555a90900e962df6e8 -DIST rust-1.63.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B ed2a82a7a04f1d831480f7aa32ef8f0524424aec50ae8f75d2c186937b1c3e3bd953306dafa026a492b1792043ccace535f26b4911691d58b27d799585d2f024 SHA512 c740ad1bd86074b27c233167e2a66b20a9e79d2505e6e00b38a1f8053f136218dc21618968c4d709c8c2936311449187ce15d16d078832b7107303b56ba9c55e -DIST rust-1.63.0-powerpc64le-unknown-linux-gnu.tar.xz 202613736 BLAKE2B eb0fcc0c0a615dc1d48591e9d34bdfcdac5adbe2b5953faa8e11b0147a09a56fac3161e2c0f5c4c0d399a3a9431effdc84b938f00469f262c24f06d1c0489a08 SHA512 9c9927b9c22d8561a9b45b237e64d3afc1725cace695fa6623db65731e9ec2cd56e105949d866f5feb62c6ec717852461ef0153fc9d028fbc5323ef231eba69e -DIST rust-1.63.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B efdb321cae9af3c3ff8854b52281211c80833f30785004c70df79bb73b094a21fd63687372dd1cb192a2547fcb7d8bbc7c4ae27851695aecce71e085bad34396 SHA512 c876eedce00ef013d2af89218a6ab5108d9ab5e3a60d7afc5afacd39e5a017ab99ef12a0ff954e8861c42a3ff9bc9030077bd9801f575620e015590a82ea0f25 -DIST rust-1.63.0-riscv64gc-unknown-linux-gnu.tar.xz 195670272 BLAKE2B 487ce5fd3dfa59914264953792d8f44433d88d9ca29bb647effda24e170a55470cca35fe653f6706f78e6b0c70265d0735585b17d7108bd62b71cd84e7f1312a SHA512 b6da4a3651b205f819e002157d196b014e4ad9923f854271dd6b306d8c69dc3d619b9a3e51c56ea2d2402566fac775d42719a67952c8f3e93933594aadc67831 -DIST rust-1.63.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 822415e792104724494f29dee1a9730fc0328e00ee613c163d3cc8298fd3f85465d5c31d2c94b479271dde0721690c78056ec3828e14087a5c5b82c0dee0d4b8 SHA512 9b2d8239708baefb075470aeb37d5b62fb934d4074c745d89467d4f9efb91c10b7c999b726c4edef720b58e95e525cc72fa20d4cfbe6d0ba1352f5fca5d1e195 -DIST rust-1.63.0-s390x-unknown-linux-gnu.tar.xz 219060812 BLAKE2B 8087db6ae903fed440bddfe4a07fee35292b16fdb847155cf584dc1a7adbeb4a8f55bd17afeb015dba53c29a05bfbd3f5373b2e30018e4a56d400fdbd1cedc3f SHA512 11bed7ebd8bf977aa34ef9f9dabee8428baede670885b4f268335fe87b81e41b426e94ca60db218e82be2e6e73ec33123c77922bfee7ae9373bfd9227417214c -DIST rust-1.63.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 3f656cd12927155b4debb68e821d9db3fa880ee49c557246c34390c44ab6e2c456d8b29b1c15c933de868d0884a83b2b419501af06d4244830d59032d5ce82a5 SHA512 521f95024624200c67d556c533d307468007c01a7de37cbd65d4af949275933cfee51334338838f5e4a9136a363b65bec47bcf399ebacff7f5558ae59c1d006c -DIST rust-1.63.0-x86_64-unknown-linux-gnu.tar.xz 155435832 BLAKE2B d5427a7380a214a7b1ad2f075b162f6f49056a96a3a1153df794025d9a1456083dd3e7ab9eb3c71982982701cc1f8a93405640f8b622fde60819ee022413446f SHA512 9e538980b6a42d14b7ec08bd1a3ddecfea24e5d3068226edf212486bb5a20bfcac22f1f917a06536f6f26dcffedd65c7049870bc3d70b9c972075bcbe58eb8d9 -DIST rust-1.63.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 0b4465f1afbf2f5f9135cf722632ffd7df9ef4e92c65e9ef6d4aede5b1ff392973949a6737e88685033ee571dfefe9b099d477480d7aaec2a329926a87a6f5b2 SHA512 0c8d339204a23000cdebfaee7faaa576673bd8d98111ea187f5e19f03f7231f3bbec8158c5b04d8d903877f1addeebc9f4fdc6b1de0fc0ad2995742987eafb1c -DIST rust-1.63.0-x86_64-unknown-linux-musl.tar.xz 254705824 BLAKE2B 8d35bbc3ffa53b52d7d7aacc51b90283d9703a40d5623c184a79195799aa3768a34942e235e2002a0b72d76110c0d66fb5ea403f9d0c81021ead52cea2a51e40 SHA512 995530319a14bd6674d5be145e777b7fd482953e62ecf672a29e2c5b4bf567e010d7db4d5c6acef1603d79135e74f21955d9fc13ed7e1c33279d05aae39bdfec -DIST rust-1.63.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 2681d77ffb4c40305ff532f975a9e31ea72a50fa2a25661ecd721a50f081a4ab3a659b2a06500540dbf21357af098add2a4a4dec63f50d5b3ed4c041fe4b49dd SHA512 012b2cb560e0d2514eb288960e6a3703f9be9a7e611b915f07f1150645b8527fe653d3fbb795ad62c5e431cb4ca175a915710913eb2b9f2912c188d17baa0d14 -DIST rustc-1.64.0-src.tar.xz 137841332 BLAKE2B 8acd9e0a4632ba2114018a5cd3f2d544324c601c246658f60a9e0be513c40375434d0a416f0bfd4d24493eae3fec7c9f5bb52d008c88cde14de503a3b6873dd1 SHA512 919f40acd8c6eaaef399aa3248503bea19feb96697ab221aaede9ee789ce340b47cb899d1e0e41a31e5d7756653968a10d2faaa4aee83294c9f1243949b43516 -DIST rustc-1.64.0-src.tar.xz.asc 801 BLAKE2B 69f7bd7600d99794859c6fad4b44f0e98868e4e16041d6fe81d9d09a8435c75abac67a735adb0b81a2d9f85651841d404bc1ef4cd64fccd75e8a25d6d95729d0 SHA512 a831e3941849add1082c5b47b619ea87405b875d6eeb90a35f42742a511d124c29503debd17dcc8c6aa9e03a754ab51c3a15e99192bdd0dd1b8a59af9b6eb0b8 +DIST rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz 245636524 BLAKE2B 90e405bc6e7f47aec091924bcd7a35017d591936b2697f2b0ddc5271e65fa431cc193a2b392489b6636896fa2d4f3d8f5096d197cfed36e812ea7f3986130c85 SHA512 c163b19a56148646ebbdb10b5b20459a206b4a1c45a2de9ce69f2e45dc5527cc69920f81007ee6fb75080782d534a2a39f7580d0c8cfdcf36ebed971b2513b63 +DIST rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 3ed79e6a5168676c19b9092692576b72b7bee6cc6fc6fc9213d492ac9641974e0bfefd9eee2663852580ee05038becb3045ff4410fe96aa8e529afc4d3652abb SHA512 14e635fbd60512e8d36c50c2c07d510236cc73661a6294f0a01fe260a945581885c60783e72cbcc0d85b87a161e0940b34b496380bbab659c6e5d0dbb4050a4d +DIST rust-1.64.0-aarch64-unknown-linux-musl.tar.xz 226328036 BLAKE2B 43119c95866b3bd7e1b0832079f4fa23d79f5168e1aeb1d9a984897486cdaabbf035150e5633114c3d87afc8cf47e2d591e7c32961cc7cef99595fec303bc348 SHA512 8af3a7293b73d5f3129a17651cc8009290e5eade4802a872bb2a568444c60b4227a89d419c751fa394bf81a38f553a7418a0abd6ec3234737148d1561b91bace +DIST rust-1.64.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 4807f2cef672af6be484e5a7368110ebc84d4bb7aa0f97819171c43b066fac041aa341bc5df696347ecdc7e5de37dc8c159ef7308c8a487c105b977edc794a7b SHA512 ec4c9eb3d9207970f19ca9d6b12bfc293786fed57e20a3a9fa25fc6b70a80a12752c6f57c095731edc1fde1c608a94f7d89e89219f8ecd89a13758df891cc0ee +DIST rust-1.64.0-arm-unknown-linux-gnueabi.tar.xz 207018112 BLAKE2B 1f8d1bb48e5f529b84c99a6941aa0c3c6d49287492b9f63f8e9d5688bd530c67ce9ea2dcd8951a34c96d54d559f4e84cdb569397613bbedba892341fd90817d9 SHA512 07dfe4449359c89719f440da7986f35fdc1873270a8910a708a0f37daef10cf7d8dca7b6b4fb6d741bed490ba12d4e9b455aa1d13d9ae80f22e2b9c879beafac +DIST rust-1.64.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B d0653612a7e9bd4cf27ae5f7f4152ee0f14fde8d5e20a7b738a6925e395083ac851500e2b65e0a40a5b883fa441f11ec7574a5e40b4964fb38f237bdf0b17349 SHA512 3314a83af0a0fd2dbd73531952002a47d89ef155cf68037b387c5c7afbe7dc69c68bf0fa429eb45a721ae9176a82a876de04091e8fc3929c3c4825ee214c6124 +DIST rust-1.64.0-arm-unknown-linux-gnueabihf.tar.xz 208017632 BLAKE2B fc10f068fb154021391c309f36d2d18bdfe09b3e17d9ac02e8f0c258d87959ce7b62dfab80ebbfc6d0c68fa6beeb25daa7b7b3a7ce763637121c7afdcb32699a SHA512 bac5fe98e68a782683a5df0d199e8ce67d9db9fbe9f590075b34e33c898198d372abd94eeef48330d1a7799fa1396add3b1ffc154281dd5bd276f4409e3b4027 +DIST rust-1.64.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 210e7de45ab02fd2c83c1978104cedd28daa2499e475143660d5e3a6a4dd4897a866c6df22f929c61da08d2b61df489277fff73492a7e7a7749f2fe293de97df SHA512 221a0a70c03e049d2c6095575a2aabe1d32937123c86550b1f6f1b23734e996ff4bfc167b7e679809e3e383c25f15100772d8f75456e556d4ebd3aa73d789908 +DIST rust-1.64.0-armv7-unknown-linux-gnueabihf.tar.xz 212867232 BLAKE2B b3f9501c4cd68d9ca59d8a5c49cc512c0a97605eb74158c590db4ceabce5ff1aa99373c676d15676627c0631de8b58bfc4ca21463dd1109d6ec6451db909bea4 SHA512 3fc482ed9dd1648ccfd2fb459eb7c738ca26eab396b1a39b316cef10b8663e97b0ec008035936cf5e47f7cf9f8a0416cf09d638af174ffdf5b58b54b2ecb6975 +DIST rust-1.64.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B ba21487ad1a304be6cf2a12446ed674fb67e9d4b1b107ca675af236a45de6647bf96512a70a2e813466e85d388b51c674dc7435c185011ec9572bf28cbf513f6 SHA512 384f09eec47175b2cc40560a6b2ad4e792ab4b78e5c750231a312858882281ef33b40e797ccbb0a0bcb2ea3dfae4703b80941d936eb4cea229166375511b1514 +DIST rust-1.64.0-i686-unknown-linux-gnu.tar.xz 232295664 BLAKE2B 452a13cb499a29167a403b54d86c08fa84b4a10d51d7ef37954bc79f13d0ada0b3a256b32f804977d03b9e31331ef250e160b14f1c8fcdf93876001b9827957a SHA512 763966e449ce46e998f0ed9670d7e6cfae3a7147360c9cb85003cf382e1e01dabc1a448d35a102aafa96105fa65c284ec161b9bfa5061225de6d6acbf40ad480 +DIST rust-1.64.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b6055151a6442c5ae5968a380e3c5e9367307f91bc7304bcbd90d2a9434145682a70416125bb8dfecfcfce5449e6497591034adbfd4b5537601492757915c131 SHA512 1bb9b52aca4fc0f300e31d96e5fe5fbe0bec45a1ed848da66e1c83ef4fea20ebec86478ed94efd13dad3f8c6d52a330356d39a894387b87202e66400268fd4e0 +DIST rust-1.64.0-mips-unknown-linux-gnu.tar.xz 167831852 BLAKE2B 76e00291f2e2b18f2261677c1d6e322f8fef01da96514306b1fefc1a29e7e4fd0e5971614ad5c3a03a9a54321a01954d856b21df032205317c21b37470a6909c SHA512 29965d77a7fd6bcc74862d1c24a5f4843eb1870ece25691afdfa464c66617cb683cc73f8b991dee96d06e5e4791f6b71f7c81cf4f1d97539c3b9cbb15bf490da +DIST rust-1.64.0-mips-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 81f100c9a788c863b2f2388e7264b8e6b4ea062fd46d6c0e922561f491cf86227c46511ab538d8bc56a9b2d01d2ae19f105966ea00f2ea86592128e4c26b55ae SHA512 41e59d670efc9085c6e3ed59bb8808dc747eebfbd65ed976da04ff70095d91f15b43f8d257a09d2a6ee1cb07c5d1f49081529e0fc8234a26599a28ddaf167f4b +DIST rust-1.64.0-mips64-unknown-linux-gnuabi64.tar.xz 172953460 BLAKE2B 68aa0d08ba233ebe95c1107574ce9165cc2afc0a43db044b6951055e30f22ed6070f9fe10f0482923f767e39fb99f887da59dcf679c3e9c16345f943b0c3012c SHA512 59250c13e980fc38b6da08faf7713c1c9ea2865793cfb0032a65a499bbfd4f7af94604bbdab4e0fd34a0be6b74db8cdcb8c3859e5c13d8a29d8c953d67a9bc84 +DIST rust-1.64.0-mips64-unknown-linux-gnuabi64.tar.xz.asc 801 BLAKE2B eb53e83dde3acdc3cfb84c7285a1373c4059c0c06e4cfe855339ce817a0a8cbea33da9fa0894a9640871003e8058482e46a31b04dd9ad1d8ae8e9ac1b3c72f7b SHA512 2e8438ca78bfd610c8c7b99a4aa2663cfddc611fa4495f490789d7838b80a8f90b9eb7f59171da187fdbc8a17b4ebc20eb69ccdaa75cca4966246e78dd41473d +DIST rust-1.64.0-mipsel-unknown-linux-gnu.tar.xz 172189848 BLAKE2B aff9136ab374a3e39674c17b1ffa4fb8fe077301284b5dde927e0cf56e51edbb912b40d852aac4ad4d4e39f3ae20e68174dac338af6682735e8a031607652176 SHA512 9283e1e9eeff6c67c49e656709e1a6c6c52329aa913c6024af3aebd889b594f48f0c8172270c579a52d5980f7a42730a6184254b5c8002928f8f93c484dad211 +DIST rust-1.64.0-mipsel-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 613ac8c773cc6585a99295e2770879cf7a9a56e1ac43256a1d8a56a12bd9b8aa08e49df96819805f4e98230d5c6d106eae837102c21f044e7e0b7756c453c529 SHA512 24d15870efaf03a916d69a358871a427869bc41ce164dcf8968564dc3f213603d0572f34b8ebbcd98d6653ff1e70664baf8c2dbdb32a0779f361338d4d3a0f43 +DIST rust-1.64.0-powerpc-unknown-linux-gnu.tar.xz 204541208 BLAKE2B 5bbd65d8aece3e32bca62d8a8b210cf155a786501c96e509462d0c45b15f19910794ff85ade0c42b575f41bd47f4f3250c011152b968ff1ad000ead6b7a200ad SHA512 13cc41679bf1bdb94d042de18696685087f3bfc84c0f99567b8c9dc6a5796c0f122499254ca8032eced8fa53623133a8b6652e14f398a9cea95ac3364a227f45 +DIST rust-1.64.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B f4ed9d8a006f787d67b7aa18361079724dad1378416fabf18d380a67a45db6475d7da8e5389a057fd117da6af6dc7d891f9e6567af09f91c538ba6459b4e12db SHA512 f616b0e5ef7e0689f33905864c8d48405e18b5ada73c3cb9a8f9a6d80173ee3abf10448403fe7790be902123d55295412ff7af77db4770f6c824439af39e0a20 +DIST rust-1.64.0-powerpc64-unknown-linux-gnu.tar.xz 210911224 BLAKE2B b8726c1036d8de07684a7ed439a7d8365722d1224644a76219df776fc6bb0c97200afbc92a6054cbe0e98127c239cde9c06ef56a73a92b9ff320c135f8c0ecaf SHA512 8ed6150a13dfa136e16e0cee775f8c9d2926569fa17b6b88fb4e9ce1c1a127c8fda828a944e18e2bf184a0ae39a61db478103ad96acb6139e7cb25b69efdffcd +DIST rust-1.64.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b8659a6b076db11acf124d73492fd21250df3924323616931cd8a8bfd5bb00ee1c48caf4e2448bd8e0120a3bf838cf73dcb810bfae8f87d487fb507b0ad132af SHA512 c24287ac0d49fda9fdc63421cc1901b8b55fee8b0701436a2d2c809ea03cec666b5a3c941a400bf73f4365576fc2a3bac85060013df76275dcc3dc32d376bbaa +DIST rust-1.64.0-powerpc64le-unknown-linux-gnu.tar.xz 224504724 BLAKE2B dfe47070e6f9c1812b0d980c98e21c71e3d34ca41d7c4c0995b559a02cf394ec6043500a34f245624588fccd83335c32a4c57bb092b3c079f705ab4d8f1547d9 SHA512 545b1076d7bb3d32775e1a7343cbe1c6feaf5042f7a4524841970846b64251b5bc7be080994f129868f183072fb793f32a8a0ab588ac9b484e25cfac636630b8 +DIST rust-1.64.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 757dfda571cca4c2028464701970e66fc0a644cf2eec71b52ad6e499b05b3f4af1a9d4515b7ae116b07d5231b8e81ecc0a9e07c9e6603a5babada41e860f6b83 SHA512 fb22306416bb6b3021e53eebb97cb5f34a64873124b0c25409115feba2c2955082456b47b383e4ddaf3ce440b64547d9eabe444b75a78014aa119f7299bec99d +DIST rust-1.64.0-riscv64gc-unknown-linux-gnu.tar.xz 191293592 BLAKE2B c32eb7b75b33b1eb53eab0b5823ade30c6dcffd8daddf04b7914a5f48ace80873573392659c5bd5a525cd954a9f078cdefba2873a3a1905f58cf9307360a4791 SHA512 b6e97215a5e8fa6f42cd609dd949f598f69779e8318f3c44e757f7c38fc67588db8169e0f263c7f121cdd3bd8c6cc225a32cc3aa80fcd7f718f9bee6f15cd94c +DIST rust-1.64.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d922b1c72bd0fb7cfa0455f56d8c6ecee491a96e6bc54c0058ff01d8b152c2a87b4ade33f4445f345564fd1a2c9a54b81b52c1a37a32f1f91a78acc82a568567 SHA512 8860237891950bf1b9b958c950194b3617c5a865bdb1ea7834e84f74781b26959fb8a729d2043ee8cd63ee1144e307691b4adaf252d31c72f4e02ba60cea694e +DIST rust-1.64.0-s390x-unknown-linux-gnu.tar.xz 225451932 BLAKE2B f7043af9d80b814e8b7988be8ddd2e14df361d08d89e96aed93a99b15719288aee064ed496008e486ee424cd8a9fa0edb78b34addd00646c1359d2bf504317ec SHA512 92702533159a4009be38314f03e26d36b45869709a0bc8f6394dddbd1ff61529f928071dadec36ba325cde589c5ac6b649ffc3c6db625473ed54e1686ada1723 +DIST rust-1.64.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 64c74bd0bb84f4c751dc1de20d12bfb9370cdf1db7957db07fa2f58ad692a10b8ee11a5c4bedc2f66f0291a91a1346d00de8e6f7ab57cd151003447aa8481dc9 SHA512 6301908c83618b61543c28026682901a342fb562b1cd1a2f78f8b0a388f06ea42b943bf822a67c2c4b1a2b4236250673a9d5bba95b85e182131a97395bffecbc +DIST rust-1.64.0-x86_64-unknown-linux-gnu.tar.xz 161922032 BLAKE2B e8a0d13deab59b5f6e50aaf5a9fc39e032b759dadf4a7034f8824677de34940fab0e6e430299379f305f0849556608fc7db207db52bea6523ad83abda4e04624 SHA512 ab687e9142963c5f9d6d577022a0783eea9a3473ff6186950d2c6a15640bf7d3042857eaa1bffc1e472385893eded6e171d7f59dce988752830697398c766bd1 +DIST rust-1.64.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d13ab08a8ce4b9a92c60ab5b8c21087158b66d9a673b7a960103757a2b12216cab8e7713cda08753a5f5f921aa9c7d571da77a90166d6e7362549a49d6c1a501 SHA512 fda5b45652c0929fea19146dd2c5a895ae4c6db9a1bf448a7364899854ffa06a8eb52b35bfe28c8acdfb1633cd8afe6c5eabd622b7887ed267b1b72220ef4e6f +DIST rust-1.64.0-x86_64-unknown-linux-musl.tar.xz 265843112 BLAKE2B 2b267b5b9aae610734759a690e36600eeeedab7e0b679e651df269d7b71b147984c1d16cab4658076f05a8a854afc74d83e6e61dac3a8a6bf2b56660d3483285 SHA512 c722ddb6a7bfc5b8767e2a37e697f625b4e775582423720d1b01737ec3269c82e2212f7e5a672a062fa49c8c15c0d2d182ea14dd048cfd9e07704cbc04fd8ef0 +DIST rust-1.64.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 783791aca41910e8074fd1c7f29e6fc1fdf51f80b1515bac99431305dbe6085574b2b2366c087675b6a9d98931a0cff1117cd864f634fdb4dd53792aab8ce5f9 SHA512 a6d0a72e9edbbc1e6caef7a9c0ec46518b95172afa4a33b2258286458d7b9afe72f9de8411a83567520a126b8377777e125cc639bac197a0495f17120fbcc1ad +DIST rustc-1.65.0-src.tar.xz 139674928 BLAKE2B a218263fb67e306b153f5a6dae95b5ec653acaa5eb4b833862d6f0fd4685a8cec097dadc1b8a934e1bf6055672c7a617f9a0ad4a7dbf2e78084297f10b7ada04 SHA512 3d0369ed3028209c4ecb9b9e7b5f5e3a20be8cc05199675df4f091d62a96c0734bc1dbd7630928fe162792392ec6d0daf9ceed10771531ce022200c7b631e3be +DIST rustc-1.65.0-src.tar.xz.asc 801 BLAKE2B 43ff92011cd6f7f34ce0495fa341379e5907d032ea90f91e533e5edaec6ad518aad50a9d8b2694074d6909ee96aa779403b16e95792e962e79c1b967542ae26f SHA512 75b9be53363022c81333117876cbcc573bbd4733edf767cbb164218644efb1a9c4bfc2aa73aaa1e39f248a84f1adacb1930a94a6e63f60093ff760fb9ae02efc diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.64.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.65.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.64.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.65.0.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 7fb122ad69..4c695759fe 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -12,8 +12,8 @@ =coreos-devel/fero-client-0.1.1 ** # Accept unstable host Rust compilers -=dev-lang/rust-1.64.0 ~amd64 ~arm64 -=virtual/rust-1.64.0 ~amd64 ~arm64 +=dev-lang/rust-1.65.0 ~amd64 ~arm64 +=virtual/rust-1.65.0 ~amd64 ~arm64 =dev-libs/libgcrypt-1.9.4 ~amd64 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.64.0.ebuild b/sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.65.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.64.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/virtual/rust/rust-1.65.0.ebuild From 331243791961ea362b72c6ef7cc34ca904728b38 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Tue, 8 Nov 2022 12:44:38 +0100 Subject: [PATCH 2/3] dev-lang/rust: update to 1.65.0, sync with Gentoo Sync with Gentoo to update dev-lang/rust to 1.65.0 Gentoo ref: ec128832c39662fec523d84fb344b0f4a1fbf7be --- .../1.61.0-gentoo-musl-target-specs.patch | 166 ------------ .../files/1.62.1-musl-dynamic-linking.patch | 25 ++ ...vendor-rustix-sparc-has-no-SIGSTKFLT.patch | 60 ++++ ...ore-broken-and-non-applicable-tests.patch} | 36 --- .../coreos-overlay/dev-lang/rust/metadata.xml | 15 +- .../dev-lang/rust/rust-1.65.0.ebuild | 256 +++++++++++------- 6 files changed, 248 insertions(+), 310 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.61.0-gentoo-musl-target-specs.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.62.1-musl-dynamic-linking.patch create mode 100644 sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.64.0-vendor-rustix-sparc-has-no-SIGSTKFLT.patch rename sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/{1.55.0-ignore-broken-and-non-applicable-tests.patch => 1.65.0-ignore-broken-and-non-applicable-tests.patch} (51%) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.61.0-gentoo-musl-target-specs.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.61.0-gentoo-musl-target-specs.patch deleted file mode 100644 index 9701481243..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.61.0-gentoo-musl-target-specs.patch +++ /dev/null @@ -1,166 +0,0 @@ -From 331c3839ebb0099101e1d2f88205ea42f4e3b319 Mon Sep 17 00:00:00 2001 -From: Georgy Yakovlev -Date: Tue, 24 May 2022 12:03:20 -0700 -Subject: [PATCH] add gentoo musl target specs - ---- - .../src/spec/aarch64_gentoo_linux_musl.rs | 11 + - .../src/spec/armv7_gentoo_linux_musleabihf.rs | 11 + - .../src/spec/i686_gentoo_linux_musl.rs | 11 + - compiler/rustc_target/src/spec/mod.rs | 8 + - compiler/rustc_target/src/spec/mod.rs.orig | 2465 +++++++++++++++++ - .../src/spec/powerpc64_gentoo_linux_musl.rs | 11 + - .../src/spec/powerpc64le_gentoo_linux_musl.rs | 11 + - .../src/spec/powerpc_gentoo_linux_musl.rs | 11 + - .../src/spec/x86_64_gentoo_linux_musl.rs | 11 + - 9 files changed, 2550 insertions(+) - create mode 100644 compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs - create mode 100644 compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs - create mode 100644 compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs - create mode 100644 compiler/rustc_target/src/spec/mod.rs.orig - create mode 100644 compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs - create mode 100644 compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs - create mode 100644 compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs - create mode 100644 compiler/rustc_target/src/spec/x86_64_gentoo_linux_musl.rs - -diff --git a/compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs -new file mode 100644 -index 0000000..ca5f28f ---- /dev/null -+++ b/compiler/rustc_target/src/spec/aarch64_gentoo_linux_musl.rs -@@ -0,0 +1,11 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::aarch64_unknown_linux_musl::target(); -+ -+ base.llvm_target = "aarch64-gentoo-linux-musl".into(); -+ base.options.vendor = "gentoo".into(); -+ base.options.crt_static_default = false; -+ -+ base -+} -diff --git a/compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs b/compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs -new file mode 100644 -index 0000000..24b3b30 ---- /dev/null -+++ b/compiler/rustc_target/src/spec/armv7_gentoo_linux_musleabihf.rs -@@ -0,0 +1,11 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::armv7_unknown_linux_musleabihf::target(); -+ -+ base.llvm_target = "armv7-gentoo-linux-musleabihf".into(); -+ base.options.vendor = "gentoo".into(); -+ base.options.crt_static_default = false; -+ -+ base -+} -diff --git a/compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs -new file mode 100644 -index 0000000..cab0923 ---- /dev/null -+++ b/compiler/rustc_target/src/spec/i686_gentoo_linux_musl.rs -@@ -0,0 +1,11 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::i686_unknown_linux_musl::target(); -+ -+ base.llvm_target = "i686-gentoo-linux-musl".into(); -+ base.options.vendor = "gentoo".into(); -+ base.options.crt_static_default = false; -+ -+ base -+} -diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs -index bd5b712..34b923b 100644 ---- a/compiler/rustc_target/src/spec/mod.rs -+++ b/compiler/rustc_target/src/spec/mod.rs -@@ -808,6 +808,14 @@ macro_rules! supported_targets { - } - - supported_targets! { -+ ("aarch64-gentoo-linux-musl", aarch64_gentoo_linux_musl), -+ ("armv7-gentoo-linux-musleabihf", armv7_gentoo_linux_musleabihf), -+ ("i686-gentoo-linux-musl", i686_gentoo_linux_musl), -+ ("powerpc-gentoo-linux-musl", powerpc_gentoo_linux_musl), -+ ("powerpc64-gentoo-linux-musl", powerpc64_gentoo_linux_musl), -+ ("powerpc64le-gentoo-linux-musl", powerpc64le_gentoo_linux_musl), -+ ("x86_64-gentoo-linux-musl", x86_64_gentoo_linux_musl), -+ - ("x86_64-unknown-linux-gnu", x86_64_unknown_linux_gnu), - ("x86_64-unknown-linux-gnux32", x86_64_unknown_linux_gnux32), - ("i686-unknown-linux-gnu", i686_unknown_linux_gnu), -diff --git a/compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs -new file mode 100644 -index 0000000..b188a7c ---- /dev/null -+++ b/compiler/rustc_target/src/spec/powerpc64_gentoo_linux_musl.rs -@@ -0,0 +1,11 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::powerpc64_unknown_linux_musl::target(); -+ -+ base.llvm_target = "powerpc64-gentoo-linux-musl".into(); -+ base.options.vendor = "gentoo".into(); -+ base.options.crt_static_default = false; -+ -+ base -+} -diff --git a/compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs -new file mode 100644 -index 0000000..395f603 ---- /dev/null -+++ b/compiler/rustc_target/src/spec/powerpc64le_gentoo_linux_musl.rs -@@ -0,0 +1,11 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::powerpc64le_unknown_linux_musl::target(); -+ -+ base.llvm_target = "powerpc64le-gentoo-linux-musl".into(); -+ base.options.vendor = "gentoo".into(); -+ base.options.crt_static_default = false; -+ -+ base -+} -diff --git a/compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs -new file mode 100644 -index 0000000..cb3121d ---- /dev/null -+++ b/compiler/rustc_target/src/spec/powerpc_gentoo_linux_musl.rs -@@ -0,0 +1,11 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::powerpc_unknown_linux_musl::target(); -+ -+ base.llvm_target = "powerpc-gentoo-linux-musl".into(); -+ base.options.vendor = "gentoo".into(); -+ base.options.crt_static_default = false; -+ -+ base -+} -diff --git a/compiler/rustc_target/src/spec/x86_64_gentoo_linux_musl.rs b/compiler/rustc_target/src/spec/x86_64_gentoo_linux_musl.rs -new file mode 100644 -index 0000000..2fcdb66 ---- /dev/null -+++ b/compiler/rustc_target/src/spec/x86_64_gentoo_linux_musl.rs -@@ -0,0 +1,11 @@ -+use crate::spec::Target; -+ -+pub fn target() -> Target { -+ let mut base = super::x86_64_unknown_linux_musl::target(); -+ -+ base.llvm_target = "x86_64-gentoo-linux-musl".into(); -+ base.options.vendor = "gentoo".into(); -+ base.options.crt_static_default = false; -+ -+ base -+} --- -2.35.1 - diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.62.1-musl-dynamic-linking.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000000..fd56396d12 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.64.0-vendor-rustix-sparc-has-no-SIGSTKFLT.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.64.0-vendor-rustix-sparc-has-no-SIGSTKFLT.patch new file mode 100644 index 0000000000..5d685baac5 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.64.0-vendor-rustix-sparc-has-no-SIGSTKFLT.patch @@ -0,0 +1,60 @@ +From 3fd653f3978e5ec2249c37eb08934bfe343e9198 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Sat, 24 Sep 2022 23:09:38 -0700 +Subject: [PATCH] vendor/rustix: sparc has no SIGSTKFLT + +gyakovlev: removed checkum HUNK + +--- + vendor/rustix/.cargo-checksum.json | 2 +- + vendor/rustix/src/imp/libc/process/types.rs | 4 ++++ + vendor/rustix/src/imp/linux_raw/process/types.rs | 4 ++-- + 3 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/vendor/rustix/src/imp/libc/process/types.rs b/vendor/rustix/src/imp/libc/process/types.rs +index 60d629d..1278cee 100644 +--- a/vendor/rustix/src/imp/libc/process/types.rs ++++ b/vendor/rustix/src/imp/libc/process/types.rs +@@ -197,6 +197,8 @@ pub enum Signal { + target_os = "macos", + target_os = "netbsd", + target_os = "openbsd", ++ target_arch = "sparc", ++ target_arch = "sparc64", + all( + any(target_os = "android", target_os = "linux"), + any(target_arch = "mips", target_arch = "mips64"), +@@ -274,6 +276,8 @@ impl Signal { + target_os = "macos", + target_os = "netbsd", + target_os = "openbsd", ++ target_arch = "sparc", ++ target_arch = "sparc64", + all( + any(target_os = "android", target_os = "linux"), + any(target_arch = "mips", target_arch = "mips64"), +diff --git a/vendor/rustix/src/imp/linux_raw/process/types.rs b/vendor/rustix/src/imp/linux_raw/process/types.rs +index 53e2c7d..859a108 100644 +--- a/vendor/rustix/src/imp/linux_raw/process/types.rs ++++ b/vendor/rustix/src/imp/linux_raw/process/types.rs +@@ -119,7 +119,7 @@ pub enum Signal { + /// `SIGTERM` + Term = linux_raw_sys::general::SIGTERM, + /// `SIGSTKFLT` +- #[cfg(not(any(target_arch = "mips", target_arch = "mips64")))] ++ #[cfg(not(any(target_arch = "mips", target_arch = "mips64", target_arch = "sparc", target_arch = "sparc64")))] + Stkflt = linux_raw_sys::general::SIGSTKFLT, + /// `SIGCHLD` + #[doc(alias = "Chld")] +@@ -179,7 +179,7 @@ impl Signal { + linux_raw_sys::general::SIGPIPE => Some(Self::Pipe), + linux_raw_sys::general::SIGALRM => Some(Self::Alarm), + linux_raw_sys::general::SIGTERM => Some(Self::Term), +- #[cfg(not(any(target_arch = "mips", target_arch = "mips64")))] ++ #[cfg(not(any(target_arch = "mips", target_arch = "mips64", target_arch = "sparc", target_arch = "sparc64")))] + linux_raw_sys::general::SIGSTKFLT => Some(Self::Stkflt), + linux_raw_sys::general::SIGCHLD => Some(Self::Child), + linux_raw_sys::general::SIGCONT => Some(Self::Cont), +-- +2.37.3 + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.55.0-ignore-broken-and-non-applicable-tests.patch b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.65.0-ignore-broken-and-non-applicable-tests.patch similarity index 51% rename from sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.55.0-ignore-broken-and-non-applicable-tests.patch rename to sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.65.0-ignore-broken-and-non-applicable-tests.patch index c3bee9bae2..fddda12e68 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.55.0-ignore-broken-and-non-applicable-tests.patch +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/files/1.65.0-ignore-broken-and-non-applicable-tests.patch @@ -10,46 +10,10 @@ simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 sparc-struct-abi: no sparc target sysroot-crates-are-unstable: can't run rustc without RPATH --- - src/test/codegen/sparc-struct-abi.rs | 1 + - src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile | 2 ++ - src/test/run-make-fulldeps/long-linker-command-lines/Makefile | 2 ++ src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile | 2 ++ src/test/ui/env-funky-keys.rs | 1 + 6 files changed, 10 insertions(+) -diff --git a/src/test/codegen/sparc-struct-abi.rs b/src/test/codegen/sparc-struct-abi.rs -index 78e5b14a212..6f93e93286b 100644 ---- a/src/test/codegen/sparc-struct-abi.rs -+++ b/src/test/codegen/sparc-struct-abi.rs -@@ -2,6 +2,7 @@ - - // only-sparc64 - // compile-flags: -O --target=sparc64-unknown-linux-gnu --crate-type=rlib - // needs-llvm-components: sparc -+// ignore-test - #![feature(no_core, lang_items)] - #![no_core] - -diff --git a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile -index f124ca2ab61..363b18f0985 100644 ---- a/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile -+++ b/src/test/run-make-fulldeps/c-link-to-rust-va-list-fn/Makefile -@@ -1,3 +1,5 @@ -+# ignore-aarch64 -+ - -include ../tools.mk - - all: -diff --git a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile -index 5876fbc94bc..5f167ece1a2 100644 ---- a/src/test/run-make-fulldeps/long-linker-command-lines/Makefile -+++ b/src/test/run-make-fulldeps/long-linker-command-lines/Makefile -@@ -1,3 +1,5 @@ -+# ignore-test -+ - -include ../tools.mk - - all: diff --git a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile b/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile index 9e770706857..6d92ec5cec8 100644 --- a/src/test/run-make-fulldeps/sysroot-crates-are-unstable/Makefile diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/metadata.xml index 7218029cc3..f64700dcc7 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/metadata.xml +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/metadata.xml @@ -11,13 +11,20 @@ Install clippy, Rust code linter - Install miri, an interpreter for Rust's mid-level intermediate representation (requires USE=nightly) - Enable nightly (UNSTABLE) features - Build a multi-threaded rustc + Install dist tarballs (used for bootstrapping) + Install miri, an interpreter for Rust's mid-level intermediate representation (requires USE=nightly, sometimes is broken) + Enable nightly (UNSTABLE) features (NOTE: it does not install nightly version, just enables features marked as nightly at time of release) + Build a multi-threaded rustc (experimental, not tested by upstream) + Build the profiler runtime and rust-demangler tool (needed for '-C profile-generate' or '-C instrument-coverage' codegen opts) Install rls, Rust Language Server (used with IDEs supporting RLS protocol) Install rustfmt, Rust code formatter + Install rust-analyzer, A Rust compiler front-end for IDEs (like rls) + Install rust-src, needed by developer tools and for build-std (cross) Bootstrap using installed rust compiler - Use the system LLVM install + Use the system LLVM installation Build support for the wasm32-unknown-unknown target + + rust-lang/rust + diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.65.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.65.0.ebuild index 6f3931d42a..eed4becde2 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.65.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.65.0.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -PYTHON_COMPAT=( python3_{6..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing \ - multilib-build python-any-r1 rust-toolchain toolchain-funcs verify-sig + multilib multilib-build python-any-r1 rust-toolchain toolchain-funcs verify-sig if [[ ${PV} = *beta* ]]; then betaver=${PV//*beta} @@ -19,7 +19,7 @@ else SLOT="stable/${ABI_VER}" MY_P="rustc-${PV}" SRC="${MY_P}-src.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86" +# KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~sparc ~x86" fi RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" @@ -41,7 +41,7 @@ LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?} LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" -IUSE="clippy cpu_flags_x86_sse2 debug doc miri nightly parallel-compiler rls rustfmt system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" +IUSE="clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly parallel-compiler profiler rls rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}" # Please keep the LLVM dependency block separate. Since LLVM is slotted, # we need to *really* make sure we're not pulling more than one slot @@ -49,7 +49,7 @@ IUSE="clippy cpu_flags_x86_sse2 debug doc miri nightly parallel-compiler rls rus # How to use it: # List all the working slots in LLVM_VALID_SLOTS, newest first. -LLVM_VALID_SLOTS=( 13 ) +LLVM_VALID_SLOTS=( 15 ) LLVM_MAX_SLOT="${LLVM_VALID_SLOTS[0]}" # splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation @@ -59,21 +59,21 @@ for _s in ${LLVM_VALID_SLOTS[@]}; do LLVM_DEPEND+=" ( " for _x in ${ALL_LLVM_TARGETS[@]}; do LLVM_DEPEND+=" - ${_x}? ( sys-devel/llvm:${_s}[${_x}(-)] )" + ${_x}? ( sys-devel/llvm:${_s}[${_x}(-)] ) + wasm? ( sys-devel/lld:${_s} )" done LLVM_DEPEND+=" )" done unset _s _x LLVM_DEPEND+=" ) "${S}"/config.toml changelog-seen = 2 [llvm] @@ -312,10 +358,32 @@ src_configure() { targets = "${LLVM_TARGETS// /;}" experimental-targets = "" link-shared = $(toml_usex system-llvm) + $(if is_libcxx_linked; then + # https://bugs.gentoo.org/732632 + echo "use-libcxx = true" + echo "static-libstdcpp = false" + fi) + $(case "${rust_target}" in + i586-*-linux-*) + # https://github.com/rust-lang/rust/issues/93059 + echo 'cflags = "-fcf-protection=none"' + echo 'cxxflags = "-fcf-protection=none"' + echo 'ldflags = "-fcf-protection=none"' + ;; + *) + ;; + esac) + [llvm.build-config] + CMAKE_VERBOSE_MAKEFILE = "ON" + CMAKE_C_FLAGS_${cm_btype} = "${CFLAGS}" + CMAKE_CXX_FLAGS_${cm_btype} = "${CXXFLAGS}" + CMAKE_EXE_LINKER_FLAGS_${cm_btype} = "${LDFLAGS}" + CMAKE_MODULE_LINKER_FLAGS_${cm_btype} = "${LDFLAGS}" + CMAKE_SHARED_LINKER_FLAGS_${cm_btype} = "${LDFLAGS}" + CMAKE_STATIC_LINKER_FLAGS_${cm_btype} = "${ARFLAGS}" [build] build-stage = 2 test-stage = 2 - doc-stage = 2 build = "${rust_target}" host = ["${rust_target}"] target = [${rust_targets}] @@ -332,7 +400,7 @@ src_configure() { tools = [${tools}] verbose = 2 sanitizers = false - profiler = false + profiler = $(toml_usex profiler) cargo-native-static = false [install] prefix = "${EPREFIX}/usr/lib/${PN}/${PV}" @@ -374,63 +442,43 @@ src_configure() { jemalloc = false [dist] src-tarball = false - compression-formats = ["gz"] + compression-formats = ["xz"] _EOF_ for v in $(multilib_get_enabled_abi_pairs); do rust_target=$(rust_abi $(get_abi_CHOST ${v##*.})) arch_cflags="$(get_abi_CFLAGS ${v##*.})" - cat <<- _EOF_ >> "${S}"/config.env - CFLAGS_${rust_target}=${arch_cflags} - _EOF_ + export CFLAGS_${rust_target//-/_}="${arch_cflags}" cat <<- _EOF_ >> "${S}"/config.toml [target.${rust_target}] - cc = "$(tc-getBUILD_CC)" - cxx = "$(tc-getBUILD_CXX)" - linker = "$(tc-getCC)" ar = "$(tc-getAR)" + cc = "$(tc-getCC)" + cxx = "$(tc-getCXX)" + linker = "$(tc-getCC)" + ranlib = "$(tc-getRANLIB)" + llvm-libunwind = "$(usex llvm-libunwind $(usex system-llvm system in-tree) no)" _EOF_ - # librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true; - if use elibc_musl; then - cat <<- _EOF_ >> "${S}"/config.toml - crt-static = false - _EOF_ - fi if use system-llvm; then cat <<- _EOF_ >> "${S}"/config.toml llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config" _EOF_ fi + # by default librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true; + # but we patch it and set to false here as well + if use elibc_musl; then + cat <<- _EOF_ >> "${S}"/config.toml + crt-static = false + _EOF_ + fi done - # Could soon be replaced by the "experimental cross support" below - if [ "${CBUILD}" != "aarch64-unknown-linux-gnu" ] && [ -f /usr/bin/aarch64-cros-linux-gnu-gcc ]; then - cat <<- 'EOF' > "${S}/cc.sh" - #!/bin/bash - args=("$@") - filtered=() - for i in "${args[@]}"; do - if [ "$i" != "-mindirect-branch-register" ] && [ "$i" != "-mindirect-branch=thunk" ]; then - filtered+=("$i") - fi - done - aarch64-cros-linux-gnu-gcc --sysroot=/usr/aarch64-cros-linux-gnu "${filtered[@]}" - EOF - sed 's/gcc/g++/g' "${S}/cc.sh" > "${S}/cxx.sh" - chmod +x "${S}/cc.sh" "${S}/cxx.sh" - cat <<- EOF >> "${S}"/config.toml - [target.aarch64-unknown-linux-gnu] - cc = "${S}/cc.sh" - cxx = "${S}/cxx.sh" - linker = "${S}/cc.sh" - ar = "aarch64-cros-linux-gnu-ar" - EOF - fi if use wasm; then cat <<- _EOF_ >> "${S}"/config.toml [target.wasm32-unknown-unknown] linker = "$(usex system-llvm lld rust-lld)" + # wasm target does not have profiler_builtins https://bugs.gentoo.org/848483 + profiler = false _EOF_ fi @@ -476,10 +524,11 @@ src_configure() { cat <<- _EOF_ >> "${S}"/config.toml [target.${cross_rust_target}] + ar = "${cross_toolchain}-ar" cc = "${cross_toolchain}-gcc" cxx = "${cross_toolchain}-g++" linker = "${cross_toolchain}-gcc" - ar = "${cross_toolchain}-ar" + ranlib = "${cross_toolchain}-ranlib" _EOF_ if use system-llvm; then cat <<- _EOF_ >> "${S}"/config.toml @@ -518,11 +567,12 @@ src_configure() { einfo "Rust configured with the following flags:" echo - echo RUSTFLAGS="${RUSTFLAGS:-}" - echo RUSTFLAGS_BOOTSTRAP="${RUSTFLAGS_BOOTSTRAP:-}" - echo RUSTFLAGS_NOT_BOOTSTRAP="${RUSTFLAGS_NOT_BOOTSTRAP:-}" + echo RUSTFLAGS="\"${RUSTFLAGS}\"" + echo RUSTFLAGS_BOOTSTRAP="\"${RUSTFLAGS_BOOTSTRAP}\"" + echo RUSTFLAGS_NOT_BOOTSTRAP="\"${RUSTFLAGS_NOT_BOOTSTRAP}\"" + echo MAGIC_EXTRA_RUSTFLAGS="\"${MAGIC_EXTRA_RUSTFLAGS}\"" env | grep "CARGO_TARGET_.*_RUSTFLAGS=" - cat "${S}"/config.env || die + env | grep "CFLAGS_.*" echo einfo "config.toml contents:" cat "${S}"/config.toml || die @@ -530,12 +580,7 @@ src_configure() { } src_compile() { - # we need \n IFS to have config.env with spaces loaded properly. #734018 - ( - IFS=$'\n' - env $(cat "${S}"/config.env) RUST_BACKTRACE=1\ - "${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die - ) + RUST_BACKTRACE=1 "${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die } src_test() { @@ -576,12 +621,8 @@ src_test() { for i in "${tests[@]}"; do local t="src/test/${i}" einfo "rust_src_test: running ${t}" - if ! ( - IFS=$'\n' - env $(cat "${S}"/config.env) RUST_BACKTRACE=1 \ - "${EPYTHON}" ./x.py test -vv --config="${S}"/config.toml \ + if ! RUST_BACKTRACE=1 "${EPYTHON}" ./x.py test -vv --config="${S}"/config.toml \ -j$(makeopts_jobs) --no-doc --no-fail-fast "${t}" - ) then failed+=( "${t}" ) eerror "rust_src_test: ${t} failed" @@ -595,11 +636,7 @@ src_test() { } src_install() { - ( - IFS=$'\n' - env $(cat "${S}"/config.env) DESTDIR="${D}" \ - "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die - ) + DESTDIR="${D}" "${EPYTHON}" ./x.py install -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die # bug #689562, #689160 rm -v "${ED}/usr/lib/${PN}/${PV}/etc/bash_completion.d/cargo" || die @@ -617,8 +654,10 @@ src_install() { use clippy && symlinks+=( clippy-driver cargo-clippy ) use miri && symlinks+=( miri cargo-miri ) + use profiler && symlinks+=( rust-demangler ) use rls && symlinks+=( rls ) use rustfmt && symlinks+=( rustfmt cargo-fmt ) + use rust-analyzer && symlinks+=( rust-analyzer ) einfo "installing eselect-rust symlinks and paths: ${symlinks[@]}" local i @@ -647,8 +686,6 @@ src_install() { newenvd - "50${P}" <<-_EOF_ LDPATH="${EPREFIX}/usr/lib/rust/lib" MANPATH="${EPREFIX}/usr/lib/rust/man" - $(use amd64 && usex elibc_musl 'CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '') - $(use arm64 && usex elibc_musl 'CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '') _EOF_ rm -rf "${ED}/usr/lib/${PN}/${PV}"/*.old || die @@ -676,6 +713,9 @@ src_install() { echo /usr/bin/miri >> "${T}/provider-${P}" echo /usr/bin/cargo-miri >> "${T}/provider-${P}" fi + if use profiler; then + echo /usr/bin/rust-demangler >> "${T}/provider-${P}" + fi if use rls; then echo /usr/bin/rls >> "${T}/provider-${P}" fi @@ -683,9 +723,17 @@ src_install() { echo /usr/bin/rustfmt >> "${T}/provider-${P}" echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" fi + if use rust-analyzer; then + echo /usr/bin/rust-analyzer >> "${T}/provider-${P}" + fi insinto /etc/env.d/rust doins "${T}/provider-${P}" + + if use dist; then + insinto "/usr/lib/${PN}/${PV}/dist" + doins -r "${S}/build/dist/." + fi } pkg_postinst() { From 9ac87490bd4a4306496b4dfaa0aa8e85fb10e8d7 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Tue, 8 Nov 2022 12:48:26 +0100 Subject: [PATCH 3/3] dev-lang/rust: Apply Flatcar modifications - Apply crossdev patch. - Enable keywords again - Remove dependency on sys-apps/lsb-release, which conflicts with sys-apps/baselayout of Flatcar. Based on commit 036e8f53c2280eadb070bab9f6bd434368e56643 --- .../dev-lang/rust/rust-1.65.0.ebuild | 34 +++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.65.0.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.65.0.ebuild index eed4becde2..d0bd1742fe 100644 --- a/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.65.0.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/dev-lang/rust/rust-1.65.0.ebuild @@ -19,7 +19,8 @@ else SLOT="stable/${ABI_VER}" MY_P="rustc-${PV}" SRC="${MY_P}-src.tar.xz" -# KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~sparc ~x86" + # Flatcar: re-enable keywords disabled from upstream + KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~sparc ~x86" fi RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0" @@ -116,9 +117,10 @@ DEPEND=" ) " +# Flatcar: lsb-release must be removed, as it conflicts with baselayout +# of Flatcar. RDEPEND="${DEPEND} app-eselect/eselect-rust - sys-apps/lsb-release " REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} ) @@ -322,6 +324,10 @@ src_configure() { sed -i '/linker:/ s/rust-lld/wasm-ld/' compiler/rustc_target/src/spec/wasm_base.rs || die fi fi + # Flatcar: Auto-enable cross-building only if the cross-compiler is available + if [ "${CBUILD}" != "aarch64-unknown-linux-gnu" ] && [ -f /usr/bin/aarch64-cros-linux-gnu-gcc ]; then + rust_targets="${rust_targets},\"aarch64-unknown-linux-gnu\"" + fi rust_targets="${rust_targets#,}" local tools='"cargo"' @@ -473,6 +479,30 @@ src_configure() { _EOF_ fi done + # Flatcar: workaround for cross-compile. Could soon be replaced + # by the "experimental cross support" below + if [ "${CBUILD}" != "aarch64-unknown-linux-gnu" ] && [ -f /usr/bin/aarch64-cros-linux-gnu-gcc ]; then + cat <<- 'EOF' > "${S}/cc.sh" + #!/bin/bash + args=("$@") + filtered=() + for i in "${args[@]}"; do + if [ "$i" != "-mindirect-branch-register" ] && [ "$i" != "-mindirect-branch=thunk" ]; then + filtered+=("$i") + fi + done + aarch64-cros-linux-gnu-gcc --sysroot=/usr/aarch64-cros-linux-gnu "${filtered[@]}" + EOF + sed 's/gcc/g++/g' "${S}/cc.sh" > "${S}/cxx.sh" + chmod +x "${S}/cc.sh" "${S}/cxx.sh" + cat <<- EOF >> "${S}"/config.toml + [target.aarch64-unknown-linux-gnu] + cc = "${S}/cc.sh" + cxx = "${S}/cxx.sh" + linker = "${S}/cc.sh" + ar = "aarch64-cros-linux-gnu-ar" + EOF + fi if use wasm; then cat <<- _EOF_ >> "${S}"/config.toml [target.wasm32-unknown-unknown]