diff options
Diffstat (limited to 'dev-lang/rust-bin')
18 files changed, 257 insertions, 143 deletions
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest index ee584aee1045..d230a3a59fb5 100644 --- a/dev-lang/rust-bin/Manifest +++ b/dev-lang/rust-bin/Manifest @@ -342,21 +342,21 @@ DIST rust-src-1.81.0.tar.xz 2901440 BLAKE2B 7ad2855c21728cc323108f7e45416a425a22 DIST rust-src-1.82.0.tar.xz 2966368 BLAKE2B 4162e7393ac21a095ac1541ea7b62fafa561ce2153bdd2b3723d0f2e0130fb2fb1325ac8583d87d64b6cf6b76400d12aaac144c781e89a177483adb46854c81b SHA512 4f7817eb16dbddf15ab09206738569370c42abe117086b085a7cc8f7174f9c2b42571707558642c72597236610eeeca32575b665acbc2cbc4f7709e624c16cc4 DIST rust-src-1.83.0.tar.xz 2998424 BLAKE2B de758c5bfb29865a3ab7ab02d17b0282272fa7d1cf5da333a6a19d6a16813320317785e9bab02e3ba9ca6ee9f26e0c96b00a117f33b74c82b13ece44133e3130 SHA512 e1f0ccae1fd4202d86cde1f1e2f4491983ec49fafb2b9eaca6260e9173bea0e0cc2567946e48e3ce48f0a620f63dc44d30334f06c935628158de110d43c7d53b EBUILD rust-bin-1.54.0.ebuild 5533 BLAKE2B d6e9c37a4ba322c4fa86d658eb3517a3c45bfa3341869ffb040c6ca350c16a892f26abe3c51cdea52d42c453a837f3204256285170729ae301d16e63db8bb8d4 SHA512 7ed26906372c87134263d00cecd62ad51731a906529eb23765dbca78efd921f1713d23d2f46ee0f2a5a2cedc2554fa60749b25f3a23f9a030821b90d7999adcf -EBUILD rust-bin-1.71.1-r100.ebuild 7158 BLAKE2B 27c1760199973c531684c00cfbfca9c33d0537229aad58be007748568cfd8d8e5c42b91d98237b6bb1bc11442ed6b58c6d749a873b78fae81aa4d3b13ee7f323 SHA512 998df612f2e5ceeb9241bc8d87dee62e7ed8f2deb696ae0a24f030e05f5a2da43cb872c52c551deeb14c566d87bfe79a5c63c91ad74f71249db412bde88fb44e -EBUILD rust-bin-1.71.1.ebuild 6976 BLAKE2B ab06c32b5859fd3898d88dc3d296d890556849078f1cfb2cb76a56d1437abbde406ef394b07e410ca0965671714b45b8eae832b93e2911ac8bc2aed2d84dee23 SHA512 aeb25676217956ddb976237888c3b6a9891360c39b9acb802e8e9070881d16b34f3dc5c2b884e21554a9986913f8443ffa4aa9cbdaff6ca5600abad3f298c4c7 -EBUILD rust-bin-1.74.1-r100.ebuild 7501 BLAKE2B a518a84b9875e1620251817d3b40b522f793f344220d97c6a2bc3166394fb961ac68994acc18701e6a47586cf3cf1f3c38b76c0be45f58407b2734a6b03668a7 SHA512 5d9e28bebf3f3f1476ba8b4b60fff0ec4b7e679ebdde60f9ed90fc2d67cda1e1908dc46fbda7d86b8caeb76256ddc5a7b07a53b372db7ef1fcb74d1fc7c17471 -EBUILD rust-bin-1.74.1.ebuild 7319 BLAKE2B 49f5ea1f31bf27205c21ab47681ea0cfd0eb834533b47fd85564ae2d8ed012b5f3b50458c75b5fd73817ee067f255481ebb592b173e0a7e7d8e0be1da3dfd183 SHA512 ddcaa062ce63cd66fd3f633a4866957f7ad85f67ca239a70f4719a8cf1c5de5a8b181ea5322e1733c1e158241dcdbf9ae126bc4fdb1e96c9d1472d8cfb5495b1 -EBUILD rust-bin-1.75.0-r100.ebuild 7501 BLAKE2B 49c18f7650b993e09940dfb3723a86259d666b0d978bc4f02936d3375456866eb7c1b637fcc4d6946465a2d39952c3d5b1233e39abb1517342d393bf30b3b175 SHA512 887e0bd1948b4ee21a7861b730b3ff139902bbb713d917551d0a2d6133b83c5767f2aa7ff75353d0ccbd8ae3d7ca36902bd5b4f3c9d9c5ff68f18a6000faf55d -EBUILD rust-bin-1.75.0.ebuild 7319 BLAKE2B 6d651ee302620a28e8c9312af50eacb4638b5275c432909b061fa9aa5a38660b29a9e519409a5aa9a9f706ac7e2560266816c22b61c4f684ff5ccf23d715de22 SHA512 b9ba5e15c1cded9ea67a42fd22bc11680fa5622354140bafe663f20ce5de953a91d36b5f8f7d6acae9c3b4ed223748471672d0d45d8efd02c139f76698508baf -EBUILD rust-bin-1.77.1-r100.ebuild 7540 BLAKE2B 5c6f0bbe41f7a6685dc45cddac28cf5b7ec59e081518e58e0cfa49bf231233a82f9aaa31d93f38282fdf019154923bc8a95da1512e3f6acf422cbacd7db3d256 SHA512 b66e1ee9c6a8d18f274e44af1d976a52fc53d35d08f9fdadffc00a1c24e00c993950f4213c666498ad59e6d7ee5384964ab0460499fa299b684faf1b7eb5df49 -EBUILD rust-bin-1.77.1.ebuild 7497 BLAKE2B fb9a25879a8886086486ba5e2010021c01e16ea2c525bf3d36d23e72c7a24eb6f196fd96d3d29231070f5a1db807865e135915224d37eebdffdf485ecc4ca83f SHA512 7ae2fb17a2fcd2d76ae85d1b0420429544a005e2c5ce1cd18a5351353b840d4048d491a316a7a97197198045f4af5f98681b4fa7b5b47df060e0ea6112b3512f -EBUILD rust-bin-1.79.0-r100.ebuild 7647 BLAKE2B f36132a2fe2294d2fdbd01b3a295117280c06d7336c0647da367ac85f5929624f082e51a8fb686fe7abf57dff96b659b298a57be91aa9c7397acfd39406948e0 SHA512 6577632592060e89d24c8413f14889ebef75b31d971da1f3f501508b5ca010d20c44d6d06f4da00f6056c7e0c0d342ad5801ab5fa0e3dc163cb5202c8767281b -EBUILD rust-bin-1.79.0.ebuild 7604 BLAKE2B 99c532442ff6e40c70a391d777122c32deec8ba8cf45f19d1abdf8e19f75a8776c9741ef54915995e24a646ff94b6e7ed76b2d27ac6631645179109915903d90 SHA512 b64087f5de9753a1476ec0ab72151309e75f4aa847ef0556bff0848a15b473fbb0a535ef1e957d19c92f416ad159d519c97764eb55802fc0c466930002e7e671 -EBUILD rust-bin-1.80.1-r100.ebuild 7856 BLAKE2B 042a6bdee5fd30fa3a060314f835be9c1cb713bba276e9b6ff54d08c03a5de5b4cf026a7b684bd90b37e50f00628b2181627f26236ac8238507f208c993ceeee SHA512 86536d61eec44ee55f14770edbf7d5c9c37b7fdbd3f7f58b36d234ba95ea32a0304d62a32c17fb114aef485f3e2b0aa7dec296acbd320857f800237184ee48a5 -EBUILD rust-bin-1.80.1.ebuild 7813 BLAKE2B 188d7efcdd2e6a0b688de4520db2d179f91bd51ff2a8191b44a5d5cb8be12f668a47cff5035c22b3cab7b00f5043f622b2fa0d80bb642aa1403faa10bb362f4b SHA512 8e53e1c781196eca1b2488602b2a3f2c81ff82a7bdd0a09836783c1fa82e4c34f2d073274186eb57683741d8bc69b870bd9921aeee31a29a8717e1350e3d6e03 -EBUILD rust-bin-1.81.0-r100.ebuild 7782 BLAKE2B e7758165904e80b42c4c06e452938354a0bf56e545fdfdbe521adb8e53b72b8fce84604bf54d81989e47d77f978609eb2717f7aa21b659b3ec0c0657e1dff532 SHA512 f81cca87968303baf11591f7682bd6f317047723cac661fe7621c5516470e803e363db1fc5edc9fe8ed71b96f723f79e066e1c445e6d7976a99006ed0c08f6aa -EBUILD rust-bin-1.81.0.ebuild 7589 BLAKE2B 2cc70b0f0fcbd43b23a94c34f2453051b55bf7aa0081a64dcc64fc0da9edcedf780b3be55e8d56ceb0afd6c66f91d8a82e7f91d51ea76a876fee320132c83d10 SHA512 bbb441806791c0816e5216c812f07e0a5269886cf82edd5411bf908dccff68aa8ed06f39052086c48ae6066c982deea521621d98272dc586917e6b271104ff8e -EBUILD rust-bin-1.82.0-r100.ebuild 7810 BLAKE2B ca3be6524a800b0e93e2828019664d2fb37b766076f9e7079ec29d580e5ff55b36c15008779b5d6544fd6c967e074d997c39d6f7383e5a29b31090dcf8531209 SHA512 287d2e942abe3598d2e9fa2802a12d2cb436ef2cd1b8d0087fa4d7be32e6d16a8a8a5c0e2750dfbbf0fd20034a056796523474e5e90ca02ded2da17e1708f225 -EBUILD rust-bin-1.82.0.ebuild 7624 BLAKE2B 2706be9714c3f62fb9c18d176ab3abc31dce8305cdc137e7d63cf616ea0a7315d4988659ddd10f67dec9c732cf17aec623df9a7c0781f2baf73d4db24689834c SHA512 0ce02301710e059bcca5e6f079ead6a9e9f5642f3fa6a6713615c68f0d0c65dd1b509d65a372cc64d9022287d41a0558a8632d026e4664d0429a9210e527291b +EBUILD rust-bin-1.71.1-r100.ebuild 7172 BLAKE2B 45f50d3ed8a50c6b7fc6631c913823b8c5eb8da7a01df8de72e37321cb57166abaed860c8569472c75387fa77bca1819f5c8c0c8ea11b76a0a5c4544e60a238b SHA512 817fd9de70801b0fa0e7bba181f2cd18e2c4166efc1932ce896199f23ec5236881e22d5af91c0921e777a5dadab70aa27fbe17d738abe3913be13007963557bb +EBUILD rust-bin-1.71.1-r101.ebuild 7624 BLAKE2B d39a05b4a4dc6d6c7b95c4bcbe7651617a2414a6099027081997dc4e76bc74d3528a6b072fb3b383139d6565a31f16b00dadcc0dbab58fce2db82be6484b51f5 SHA512 8fa9685a420c63f3aa52c1988e2d0c4a5e10c42c6c3628bbc822d4241d90995062f2fd43df347f7b4222d7ad7281640130df9ac362f6ae87ddb3397235219139 +EBUILD rust-bin-1.74.1-r100.ebuild 7515 BLAKE2B 1b032dbeea836cb41bc19dbfb22fec5e6d3caf901274a7ad685873d732e853358c10c4b4a6f28e125af27d686db15ac38e186fe5375457147b44784d9057dc55 SHA512 de882f58d3721a79b35b5b7401ccac44e243e43d8b4326ee22d150f7d55641ac109c30873ffe23c02b47c3499fa7c46ca1ea6800ab19497f6f8b2a512f9289af +EBUILD rust-bin-1.74.1-r101.ebuild 7967 BLAKE2B 6a1712de1d33abb0b46b993871c55d04fc38fe3242da7d5f2fe3de7f08ab8d963a7825ba7ae4b6aa52b6e3bc97cef0647392da062c52f903286f3cc1745151be SHA512 0f2a42d7a647aab723b1aa825d91f6e74a7b41a1fde8904ca8a070e674acf27ca909ddfab51f085e156797a46e54882c01bad674811d00d43888302e6fb2d908 +EBUILD rust-bin-1.75.0-r100.ebuild 7515 BLAKE2B ad881d6edd0ed444b4b9ab3a4af289034dfb2fd32c1a4c0919de1067e0009551bc968d5268f8ccdee30d0823bfd3b0e15c2d760b24399b870fd0871ee0818f36 SHA512 913b0af01c958368b3779926b1a6e01f4bc51239613d66158a67483ce71fdc2d3932fde86eedd0b10b9c96c7d2dfc199f41f1d6747adb70b33dcbc304a48df6b +EBUILD rust-bin-1.75.0-r101.ebuild 7967 BLAKE2B 2ce384dbb1d1d5e26116d2c5296cd5dd865c1722020ad53cbae9ad95d5ad1b7ccb22659c4823b4cc5969204af1d1e78520333b25a3cbdd39dfcf2e8e2ff6abb3 SHA512 efc0d1271aeb1d4c7c12fe4fa5b45f67af786e6ec9734ba5599baa8fa8090d3fc5e40105c3a1077c4e30e5055e660973bf52ed71172e0b607532ea415567193b +EBUILD rust-bin-1.77.1-r100.ebuild 7554 BLAKE2B 140eeeb5081f663d02120408b1312314c18ddeb0d602320c515f042cc2ba229af1e412616b41804edae234cb9f554fe32b3a6d08d98274bb868a98ec84b5eb71 SHA512 bed261877e8afcd8eff7c7e13f94af3563a1922a99171bef33fb8d680f81c237e67622403784c14a51b4249818ba2d34febefe9e4c9c64211f3761d698fa707e +EBUILD rust-bin-1.77.1-r101.ebuild 8006 BLAKE2B 8e1c0a9ecfbf4e51a5e076864f22a8bded6d0b1e1324498c3d5af9f3ee0f7420e3c33a1e01076e53d42b69d323faa7daabcb2cfa67224edd5eec8707328506f5 SHA512 28c5bc94b714007560a100eb972c34f306b2dcecb6c7d9a172b759419a58ff5bd96f4285353acb363481cbb7f3f3123c19cb1476299fb9f5f23cae15c27b618d +EBUILD rust-bin-1.79.0-r100.ebuild 7661 BLAKE2B 4955ac2f1a30b057998979d75325f48e814e98da9ba3c02db49c20b7a756c1a32275a91e661fe8d34d585abc5581f0a8818e41ccc958c9738ea7f6c8e79fb131 SHA512 0f45e0b3a1ac6b732f3e5818bf0ecbdc5af9e32273ce4b7ea52943d6da82c4dffbf328abd1853f732c023be22fc69eb5fc2046d4eee13fb35151ca8cb78c18f4 +EBUILD rust-bin-1.79.0-r101.ebuild 8113 BLAKE2B d6d123890f93ba99e0e65466e5d4c9a80c0e68f3e321a4c401006f9f03b3aab5bfff5d00dbf2516ec7a413703ce94c08d1043f090341b8b6b644e750fee2d0eb SHA512 f9352dddafc0086f7c7816a2618f70b59e5bc15457f25bd558a13db2f8a4b6e68e2d4c9f1c007d7c7547809dc1f621bb040e165d88bd53be0ddcdaa415d1e3c3 +EBUILD rust-bin-1.80.1-r100.ebuild 7870 BLAKE2B 92261bc94f05136c4971c3d3979c31d2e626a39ecb446708076ca5eb896ea6e854bdfa47578b3cc053ebe4f8559ada84e3a8b406150fdace387cecdfa1db0557 SHA512 ebc84766889156afca927c7c11ee6f103b64f92c1cce4d8cdf241566248b1a7cc1c92efe498c69a1240b3ecb725873733d0afa4c015b69acd637d6bd46740237 +EBUILD rust-bin-1.80.1-r101.ebuild 8322 BLAKE2B 7a8746ebcac8ffa87136b6b2021e70896eeb866e5326c5ae1e45adb83c6f87e7df4e1f6fe2e0f5188a7369471831efa80db9210d2285ba61fc64b437acf947c0 SHA512 c57221386656702d51b886748511d43761aa2585027fa9da4320048951332eb2fc71e77d540efd7b569911964ec63d1101c39c7dce8d7ec6cd487090d47ce887 +EBUILD rust-bin-1.81.0-r100.ebuild 7796 BLAKE2B abfb9da9dcd3fb1e2ff045c2d5427eac2c08a79c02dff00d588b4978156e2478b430248454776269bf4c22d2afdbd6c21e07c94a7148f16537c0fba79fe8abbb SHA512 34b9cfb3daa201411c15396227e5b61507a42b71edb956ce992a70341936e01a8995b5e22b04d3f2a053f1846504d5ed33567310a149283566c21d12e4b9296e +EBUILD rust-bin-1.81.0-r101.ebuild 8248 BLAKE2B 6ca8301f85eae0745cb11cb34ba48b5ce78d16aa02477c68e0febca5a5187e64e3f360829fa26b4c09cba7c6d68a7032c22ba6bbbb7a331b70bee9966483282c SHA512 fc0495ea1986c063dbd91a4bb4d720de7a3cc1deaae8206fb47bd07d38f88171c9ea0062a4c7acb2b7bc1fbcbbae7595cc1c3ae36665962a8edbca363714dcdd +EBUILD rust-bin-1.82.0-r100.ebuild 7824 BLAKE2B f0bba4862cdf898d8441d749d2d0316b0be64e9a0898f750fe59a79c18e42d1c6a7495482ae1889e6a0925e294d88d7c4a4c3792c0ed2a571b73328549907d5b SHA512 17bf2bf8c81395123ae4b785f13f500185454dad74a6f7e9c7485798d415c0e3bf2a637050a52be3381caac58a4daf983875621b4981cced28b27a9c5fe9cfbd +EBUILD rust-bin-1.82.0-r101.ebuild 8276 BLAKE2B 39de6d0cca689ea4276afa20fc7ed586fa67386bef4c1304650f582e6804eb551ea20dedf1322a6a4a90814eb0a739261ff6b41f6c610155bbeae860877b73cb SHA512 2aa3bebc25247d0ba42e1c28ac4b356033e9643f52bfde42071310f76c38d41c696a8324e85112c6f83b8cc282d228021d3c0414e9a1be878b0eaf551bca975c EBUILD rust-bin-1.83.0.ebuild 7825 BLAKE2B 2c7d79de6b6147847df63cfb95a6e418ddfbc84c9a6c28be27aed2c3892083fea65a1423b37f5bab4f2f0a1dafbe316d473b8e31d3a0ef621c96940225e140fd SHA512 039e598f9c107c61550ea0fedd819ce4e074bd9a0f9407b4f715c6576f9343df9c87a3b11aef677bd609f82dd1bc668a359a4d1202287f08b43998c5724890c1 -MISC metadata.xml 1220 BLAKE2B 5c4d286e569c929913317d15d37de08db51655ec41c1d3b1d84aeb6982b53afd7ebf3f9adbcd4e3c76fc9b82056648b6af1507a5728388fd2d2e8d743e5225db SHA512 72d32987894268a7b3ac8e8606428cf8315fcf29ce1945c9e55527a5c696742f6f2a44dcfe01bf5abb0cad60b5881a59dedecdc07db4ef2df22ef13e3b2732a8 +MISC metadata.xml 1062 BLAKE2B de2d2adcb691a3e614457dd9a7f5d4a8eddffd548b2de8a229b6d397ae79f7e24484512a1fb2a85e02aa98c240ae73420dbe48e45790c0cd3f6381ef5a4ac24b SHA512 ee4d08b8eec8abd89e051ee5ec6cc928bfde7039b815d4539558d71d7c0576aea939b7781b4998d3fcf2c2e8752791d53c0ba6115df07fc2243c470b2a7467b9 diff --git a/dev-lang/rust-bin/metadata.xml b/dev-lang/rust-bin/metadata.xml index 2f9b2fef5b94..bc1f3f39e1de 100644 --- a/dev-lang/rust-bin/metadata.xml +++ b/dev-lang/rust-bin/metadata.xml @@ -19,7 +19,6 @@ </maintainer> <use> <flag name="clippy">Install clippy, Rust code linter</flag> - <flag name="profiler">Build the profiler runtime and rust-demangler tool (needed for '-C profile-generate' or '-C instrument-coverage' codegen opts)</flag> <flag name="rustfmt">Install rustfmt, Rust code formatter</flag> <flag name="rust-analyzer">Install rust-analyzer, A Rust compiler front-end for IDEs (language server)</flag> <flag name="rust-src">Install rust-src, needed by developer tools and for build-std (cross)</flag> diff --git a/dev-lang/rust-bin/rust-bin-1.71.1-r100.ebuild b/dev-lang/rust-bin/rust-bin-1.71.1-r100.ebuild index 50dd03400a4a..510f9ce2d5f7 100644 --- a/dev-lang/rust-bin/rust-bin-1.71.1-r100.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.71.1-r100.ebuild @@ -127,7 +127,7 @@ multilib_src_install() { while IFS= read -r -d '' filename; do patchelf_for_bin ${filename} ${interpreter} \; || die done - eend $? + eend ${PIPESTATUS[0]} fi local symlinks=( diff --git a/dev-lang/rust-bin/rust-bin-1.71.1.ebuild b/dev-lang/rust-bin/rust-bin-1.71.1-r101.ebuild index f33217b15132..24a7ad979aca 100644 --- a/dev-lang/rust-bin/rust-bin-1.71.1.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.71.1-r101.ebuild @@ -3,7 +3,10 @@ EAPI=8 -inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal +LLVM_COMPAT=( 16 ) +LLVM_OPTIONAL="yes" + +inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal MY_P="rust-${PV}" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -19,21 +22,21 @@ SRC_URI="$(rust_all_arch_uris ${MY_P}) SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.xz -> ${MY_P}-sparc64-unknown-linux-gnu.sam.tar.xz ) " LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4 UoI-NCSA" -SLOT="stable" -KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" - -DEPEND="" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix llvm-libunwind rust-analyzer rust-src rustfmt" RDEPEND=" >=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-release - sys-devel/gcc:* + !llvm-libunwind? ( sys-devel/gcc:* ) + !dev-lang/rust:stable + !dev-lang/rust-bin:stable " - BDEPEND=" prefix? ( dev-util/patchelf ) + llvm-libunwind? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) " @@ -125,7 +128,17 @@ multilib_src_install() { while IFS= read -r -d '' filename; do patchelf_for_bin ${filename} ${interpreter} \; || die done - eend $? + eend ${PIPESTATUS[0]} + fi + + if use llvm-libunwind; then + ebegin "Replacing libgcc_s with libunwind" + find "${ED}/opt/${P}"/{bin,lib,libexec} -type f -print0 | \ + while IFS= read -r -d '' filename; do + # just ignore wrong filetype error, instead of checking redundantly + patchelf --replace-needed libgcc_s.so.1 libunwind.so.1 ${filename} 2>/dev/null + done + eend ${PIPESTATUS[0]} fi local symlinks=( @@ -162,8 +175,8 @@ multilib_src_install() { CARGO_TRIPLET="${CARGO_TRIPLET//-/_}" CARGO_TRIPLET="${CARGO_TRIPLET^^}" cat <<-_EOF_ > "${T}/50${P}" - LDPATH="${EPREFIX}/usr/lib/rust/lib" - MANPATH="${EPREFIX}/usr/lib/rust/man" + LDPATH="${EPREFIX}/usr/lib/rust/lib-bin-${PV}" + MANPATH="${EPREFIX}/usr/lib/rust/man-bin-${PV}" $(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_RUSTFLAGS=\"-C target-feature=-crt-static\"") _EOF_ doenvd "${T}/50${P}" @@ -213,8 +226,10 @@ multilib_src_install() { pkg_postinst() { eselect rust update - elog "Rust installs a helper script for calling GDB now," - elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}." + if has_version dev-debug/gdb || has_version dev-debug/lldb; then + elog "Rust installs helper scripts for calling GDB and LLDB," + elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}." + fi if has_version app-editors/emacs; then elog "install app-emacs/rust-mode to get emacs support for rust." diff --git a/dev-lang/rust-bin/rust-bin-1.74.1-r100.ebuild b/dev-lang/rust-bin/rust-bin-1.74.1-r100.ebuild index 78aa2f6cfdbd..576701dfd9a3 100644 --- a/dev-lang/rust-bin/rust-bin-1.74.1-r100.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.74.1-r100.ebuild @@ -137,7 +137,7 @@ multilib_src_install() { while IFS= read -r -d '' filename; do patchelf_for_bin ${filename} ${interpreter} \; || die done - eend $? + eend ${PIPESTATUS[0]} fi local symlinks=( diff --git a/dev-lang/rust-bin/rust-bin-1.74.1.ebuild b/dev-lang/rust-bin/rust-bin-1.74.1-r101.ebuild index d2bd0f6eb5a1..e0d8ca8a8c96 100644 --- a/dev-lang/rust-bin/rust-bin-1.74.1.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.74.1-r101.ebuild @@ -3,7 +3,10 @@ EAPI=8 -inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal +LLVM_COMPAT=( 17 ) +LLVM_OPTIONAL="yes" + +inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal MY_P="rust-${PV}" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -29,21 +32,21 @@ SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar. #)" LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" -SLOT="stable" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" - -DEPEND="" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix llvm-libunwind rust-analyzer rust-src rustfmt" RDEPEND=" >=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-release - sys-devel/gcc:* + !llvm-libunwind? ( sys-devel/gcc:* ) + !dev-lang/rust:stable + !dev-lang/rust-bin:stable " - BDEPEND=" prefix? ( dev-util/patchelf ) + llvm-libunwind? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) " @@ -135,7 +138,17 @@ multilib_src_install() { while IFS= read -r -d '' filename; do patchelf_for_bin ${filename} ${interpreter} \; || die done - eend $? + eend ${PIPESTATUS[0]} + fi + + if use llvm-libunwind; then + ebegin "Replacing libgcc_s with libunwind" + find "${ED}/opt/${P}"/{bin,lib,libexec} -type f -print0 | \ + while IFS= read -r -d '' filename; do + # just ignore wrong filetype error, instead of checking redundantly + patchelf --replace-needed libgcc_s.so.1 libunwind.so.1 ${filename} 2>/dev/null + done + eend ${PIPESTATUS[0]} fi local symlinks=( @@ -172,8 +185,8 @@ multilib_src_install() { CARGO_TRIPLET="${CARGO_TRIPLET//-/_}" CARGO_TRIPLET="${CARGO_TRIPLET^^}" cat <<-_EOF_ > "${T}/50${P}" - LDPATH="${EPREFIX}/usr/lib/rust/lib" - MANPATH="${EPREFIX}/usr/lib/rust/man" + LDPATH="${EPREFIX}/usr/lib/rust/lib-bin-${PV}" + MANPATH="${EPREFIX}/usr/lib/rust/man-bin-${PV}" $(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_RUSTFLAGS=\"-C target-feature=-crt-static\"") _EOF_ doenvd "${T}/50${P}" @@ -223,8 +236,10 @@ multilib_src_install() { pkg_postinst() { eselect rust update - elog "Rust installs a helper script for calling GDB now," - elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}." + if has_version dev-debug/gdb || has_version dev-debug/lldb; then + elog "Rust installs helper scripts for calling GDB and LLDB," + elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}." + fi if has_version app-editors/emacs; then elog "install app-emacs/rust-mode to get emacs support for rust." diff --git a/dev-lang/rust-bin/rust-bin-1.75.0-r100.ebuild b/dev-lang/rust-bin/rust-bin-1.75.0-r100.ebuild index d2250c3b37a1..9c67001aa284 100644 --- a/dev-lang/rust-bin/rust-bin-1.75.0-r100.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.75.0-r100.ebuild @@ -137,7 +137,7 @@ multilib_src_install() { while IFS= read -r -d '' filename; do patchelf_for_bin ${filename} ${interpreter} \; || die done - eend $? + eend ${PIPESTATUS[0]} fi local symlinks=( diff --git a/dev-lang/rust-bin/rust-bin-1.75.0.ebuild b/dev-lang/rust-bin/rust-bin-1.75.0-r101.ebuild index 30174fe2be2c..a1de6b232931 100644 --- a/dev-lang/rust-bin/rust-bin-1.75.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.75.0-r101.ebuild @@ -3,7 +3,10 @@ EAPI=8 -inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal +LLVM_COMPAT=( 17 ) +LLVM_OPTIONAL="yes" + +inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal MY_P="rust-${PV}" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -29,21 +32,21 @@ SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar. #)" LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" -SLOT="stable" -KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" - -DEPEND="" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix llvm-libunwind rust-analyzer rust-src rustfmt" RDEPEND=" >=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-release - sys-devel/gcc:* + !llvm-libunwind? ( sys-devel/gcc:* ) + !dev-lang/rust:stable + !dev-lang/rust-bin:stable " - BDEPEND=" prefix? ( dev-util/patchelf ) + llvm-libunwind? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) " @@ -135,7 +138,17 @@ multilib_src_install() { while IFS= read -r -d '' filename; do patchelf_for_bin ${filename} ${interpreter} \; || die done - eend $? + eend ${PIPESTATUS[0]} + fi + + if use llvm-libunwind; then + ebegin "Replacing libgcc_s with libunwind" + find "${ED}/opt/${P}"/{bin,lib,libexec} -type f -print0 | \ + while IFS= read -r -d '' filename; do + # just ignore wrong filetype error, instead of checking redundantly + patchelf --replace-needed libgcc_s.so.1 libunwind.so.1 ${filename} 2>/dev/null + done + eend ${PIPESTATUS[0]} fi local symlinks=( @@ -172,8 +185,8 @@ multilib_src_install() { CARGO_TRIPLET="${CARGO_TRIPLET//-/_}" CARGO_TRIPLET="${CARGO_TRIPLET^^}" cat <<-_EOF_ > "${T}/50${P}" - LDPATH="${EPREFIX}/usr/lib/rust/lib" - MANPATH="${EPREFIX}/usr/lib/rust/man" + LDPATH="${EPREFIX}/usr/lib/rust/lib-bin-${PV}" + MANPATH="${EPREFIX}/usr/lib/rust/man-bin-${PV}" $(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_RUSTFLAGS=\"-C target-feature=-crt-static\"") _EOF_ doenvd "${T}/50${P}" @@ -223,8 +236,10 @@ multilib_src_install() { pkg_postinst() { eselect rust update - elog "Rust installs a helper script for calling GDB now," - elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}." + if has_version dev-debug/gdb || has_version dev-debug/lldb; then + elog "Rust installs helper scripts for calling GDB and LLDB," + elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}." + fi if has_version app-editors/emacs; then elog "install app-emacs/rust-mode to get emacs support for rust." diff --git a/dev-lang/rust-bin/rust-bin-1.77.1-r100.ebuild b/dev-lang/rust-bin/rust-bin-1.77.1-r100.ebuild index 0e64474657e5..f5be8d46db5a 100644 --- a/dev-lang/rust-bin/rust-bin-1.77.1-r100.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.77.1-r100.ebuild @@ -137,7 +137,7 @@ multilib_src_install() { while IFS= read -r -d '' filename; do patchelf_for_bin ${filename} ${interpreter} \; || die done - eend $? + eend ${PIPESTATUS[0]} fi local symlinks=( diff --git a/dev-lang/rust-bin/rust-bin-1.77.1.ebuild b/dev-lang/rust-bin/rust-bin-1.77.1-r101.ebuild index 3849d0136667..45ddf4664654 100644 --- a/dev-lang/rust-bin/rust-bin-1.77.1.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.77.1-r101.ebuild @@ -3,7 +3,10 @@ EAPI=8 -inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal +LLVM_COMPAT=( 17 ) +LLVM_OPTIONAL="yes" + +inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal MY_P="rust-${PV}" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -29,21 +32,21 @@ SRC_URI+=" mips? ( )" LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" -SLOT="stable" -KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix profiler rust-analyzer rust-src rustfmt" - -DEPEND="" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix llvm-libunwind rust-analyzer rust-src rustfmt" RDEPEND=" >=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-release - sys-devel/gcc:* + !llvm-libunwind? ( sys-devel/gcc:* ) + !dev-lang/rust:stable + !dev-lang/rust-bin:stable " - BDEPEND=" prefix? ( dev-util/patchelf ) + llvm-libunwind? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) " @@ -108,10 +111,9 @@ multilib_src_install() { local analysis std analysis="$(grep 'analysis' ./components)" std="$(grep 'std' ./components)" - local components="rustc,cargo,${std}" + local components="rustc,cargo,rust-demangler-preview,${std}" use doc && components="${components},rust-docs" use clippy && components="${components},clippy-preview" - use profiler && components="${components},rust-demangler-preview" use rustfmt && components="${components},rustfmt-preview" use rust-analyzer && components="${components},rust-analyzer-preview,${analysis}" # Rust component 'rust-src' is extracted from separate archive @@ -136,20 +138,30 @@ multilib_src_install() { while IFS= read -r -d '' filename; do patchelf_for_bin ${filename} ${interpreter} \; || die done - eend $? + eend ${PIPESTATUS[0]} + fi + + if use llvm-libunwind; then + ebegin "Replacing libgcc_s with libunwind" + find "${ED}/opt/${P}"/{bin,lib,libexec} -type f -print0 | \ + while IFS= read -r -d '' filename; do + # just ignore wrong filetype error, instead of checking redundantly + patchelf --replace-needed libgcc_s.so.1 libunwind.so.1 ${filename} 2>/dev/null + done + eend ${PIPESTATUS[0]} fi local symlinks=( cargo rustc rustdoc + rust-demangler rust-gdb rust-gdbgui rust-lldb ) use clippy && symlinks+=( clippy-driver cargo-clippy ) - use profiler && symlinks+=( rust-demangler ) use rustfmt && symlinks+=( rustfmt cargo-fmt ) use rust-analyzer && symlinks+=( rust-analyzer ) @@ -174,8 +186,8 @@ multilib_src_install() { CARGO_TRIPLET="${CARGO_TRIPLET//-/_}" CARGO_TRIPLET="${CARGO_TRIPLET^^}" cat <<-_EOF_ > "${T}/50${P}" - LDPATH="${EPREFIX}/usr/lib/rust/lib" - MANPATH="${EPREFIX}/usr/lib/rust/man" + LDPATH="${EPREFIX}/usr/lib/rust/lib-bin-${PV}" + MANPATH="${EPREFIX}/usr/lib/rust/man-bin-${PV}" $(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_RUSTFLAGS=\"-C target-feature=-crt-static\"") _EOF_ doenvd "${T}/50${P}" @@ -184,6 +196,7 @@ multilib_src_install() { cat <<-_EOF_ > "${T}/provider-${P}" /usr/bin/cargo /usr/bin/rustdoc + /usr/bin/rust-demangler /usr/bin/rust-gdb /usr/bin/rust-gdbgui /usr/bin/rust-lldb @@ -197,9 +210,6 @@ multilib_src_install() { echo /usr/bin/clippy-driver >> "${T}/provider-${P}" echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" fi - if use profiler; then - echo /usr/bin/rust-demangler >> "${T}/provider-${P}" - fi if use rustfmt; then echo /usr/bin/rustfmt >> "${T}/provider-${P}" echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" @@ -228,8 +238,10 @@ multilib_src_install() { pkg_postinst() { eselect rust update - elog "Rust installs a helper script for calling GDB now," - elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}." + if has_version dev-debug/gdb || has_version dev-debug/lldb; then + elog "Rust installs helper scripts for calling GDB and LLDB," + elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}." + fi if has_version app-editors/emacs; then elog "install app-emacs/rust-mode to get emacs support for rust." diff --git a/dev-lang/rust-bin/rust-bin-1.79.0-r100.ebuild b/dev-lang/rust-bin/rust-bin-1.79.0-r100.ebuild index 08058a9d05c7..ed6ccb20282c 100644 --- a/dev-lang/rust-bin/rust-bin-1.79.0-r100.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.79.0-r100.ebuild @@ -140,7 +140,7 @@ multilib_src_install() { while IFS= read -r -d '' filename; do patchelf_for_bin ${filename} ${interpreter} \; || die done - eend $? + eend ${PIPESTATUS[0]} fi local symlinks=( diff --git a/dev-lang/rust-bin/rust-bin-1.79.0.ebuild b/dev-lang/rust-bin/rust-bin-1.79.0-r101.ebuild index aedec2e6829f..7915bafa7dde 100644 --- a/dev-lang/rust-bin/rust-bin-1.79.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.79.0-r101.ebuild @@ -3,7 +3,10 @@ EAPI=8 -inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal +LLVM_COMPAT=( 18 ) +LLVM_OPTIONAL="yes" + +inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal MY_P="rust-${PV}" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -32,21 +35,21 @@ SRC_URI+=" riscv? ( )" LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" -SLOT="stable" -KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix profiler rust-analyzer rust-src rustfmt" - -DEPEND="" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix llvm-libunwind rust-analyzer rust-src rustfmt" RDEPEND=" >=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-release - sys-devel/gcc:* + !llvm-libunwind? ( sys-devel/gcc:* ) + !dev-lang/rust:stable + !dev-lang/rust-bin:stable " - BDEPEND=" prefix? ( dev-util/patchelf ) + llvm-libunwind? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) " @@ -111,10 +114,9 @@ multilib_src_install() { local analysis std analysis="$(grep 'analysis' ./components)" std="$(grep 'std' ./components)" - local components="rustc,cargo,${std}" + local components="rustc,cargo,rust-demangler-preview,${std}" use doc && components="${components},rust-docs" use clippy && components="${components},clippy-preview" - use profiler && components="${components},rust-demangler-preview" use rustfmt && components="${components},rustfmt-preview" use rust-analyzer && components="${components},rust-analyzer-preview,${analysis}" # Rust component 'rust-src' is extracted from separate archive @@ -139,20 +141,30 @@ multilib_src_install() { while IFS= read -r -d '' filename; do patchelf_for_bin ${filename} ${interpreter} \; || die done - eend $? + eend ${PIPESTATUS[0]} + fi + + if use llvm-libunwind; then + ebegin "Replacing libgcc_s with libunwind" + find "${ED}/opt/${P}"/{bin,lib,libexec} -type f -print0 | \ + while IFS= read -r -d '' filename; do + # just ignore wrong filetype error, instead of checking redundantly + patchelf --replace-needed libgcc_s.so.1 libunwind.so.1 ${filename} 2>/dev/null + done + eend ${PIPESTATUS[0]} fi local symlinks=( cargo rustc rustdoc + rust-demangler rust-gdb rust-gdbgui rust-lldb ) use clippy && symlinks+=( clippy-driver cargo-clippy ) - use profiler && symlinks+=( rust-demangler ) use rustfmt && symlinks+=( rustfmt cargo-fmt ) use rust-analyzer && symlinks+=( rust-analyzer ) @@ -177,8 +189,8 @@ multilib_src_install() { CARGO_TRIPLET="${CARGO_TRIPLET//-/_}" CARGO_TRIPLET="${CARGO_TRIPLET^^}" cat <<-_EOF_ > "${T}/50${P}" - LDPATH="${EPREFIX}/usr/lib/rust/lib" - MANPATH="${EPREFIX}/usr/lib/rust/man" + LDPATH="${EPREFIX}/usr/lib/rust/lib-bin-${PV}" + MANPATH="${EPREFIX}/usr/lib/rust/man-bin-${PV}" $(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_RUSTFLAGS=\"-C target-feature=-crt-static\"") _EOF_ doenvd "${T}/50${P}" @@ -187,6 +199,7 @@ multilib_src_install() { cat <<-_EOF_ > "${T}/provider-${P}" /usr/bin/cargo /usr/bin/rustdoc + /usr/bin/rust-demangler /usr/bin/rust-gdb /usr/bin/rust-gdbgui /usr/bin/rust-lldb @@ -200,9 +213,6 @@ multilib_src_install() { echo /usr/bin/clippy-driver >> "${T}/provider-${P}" echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" fi - if use profiler; then - echo /usr/bin/rust-demangler >> "${T}/provider-${P}" - fi if use rustfmt; then echo /usr/bin/rustfmt >> "${T}/provider-${P}" echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" @@ -231,8 +241,10 @@ multilib_src_install() { pkg_postinst() { eselect rust update - elog "Rust installs a helper script for calling GDB now," - elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}." + if has_version dev-debug/gdb || has_version dev-debug/lldb; then + elog "Rust installs helper scripts for calling GDB and LLDB," + elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}." + fi if has_version app-editors/emacs; then elog "install app-emacs/rust-mode to get emacs support for rust." diff --git a/dev-lang/rust-bin/rust-bin-1.80.1-r100.ebuild b/dev-lang/rust-bin/rust-bin-1.80.1-r100.ebuild index 80683713c412..37a443321e80 100644 --- a/dev-lang/rust-bin/rust-bin-1.80.1-r100.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.80.1-r100.ebuild @@ -144,7 +144,7 @@ multilib_src_install() { while IFS= read -r -d '' filename; do patchelf_for_bin ${filename} ${interpreter} \; || die done - eend $? + eend ${PIPESTATUS[0]} fi local symlinks=( diff --git a/dev-lang/rust-bin/rust-bin-1.80.1.ebuild b/dev-lang/rust-bin/rust-bin-1.80.1-r101.ebuild index 47fc367f2947..93050557fa6d 100644 --- a/dev-lang/rust-bin/rust-bin-1.80.1.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.80.1-r101.ebuild @@ -3,7 +3,10 @@ EAPI=8 -inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal +LLVM_COMPAT=( 18 ) +LLVM_OPTIONAL="yes" + +inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal MY_P="rust-${PV}" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -36,21 +39,21 @@ SRC_URI+=" ppc64? ( elibc_musl? ( ) )" LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" -SLOT="stable" -KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix profiler rust-analyzer rust-src rustfmt" - -DEPEND="" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix llvm-libunwind rust-analyzer rust-src rustfmt" RDEPEND=" >=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-release - sys-devel/gcc:* + !llvm-libunwind? ( sys-devel/gcc:* ) + !dev-lang/rust:stable + !dev-lang/rust-bin:stable " - BDEPEND=" prefix? ( dev-util/patchelf ) + llvm-libunwind? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) " @@ -115,10 +118,9 @@ multilib_src_install() { local analysis std analysis="$(grep 'analysis' ./components)" std="$(grep 'std' ./components)" - local components="rustc,cargo,${std}" + local components="rustc,cargo,rust-demangler-preview,${std}" use doc && components="${components},rust-docs" use clippy && components="${components},clippy-preview" - use profiler && components="${components},rust-demangler-preview" use rustfmt && components="${components},rustfmt-preview" use rust-analyzer && components="${components},rust-analyzer-preview,${analysis}" # Rust component 'rust-src' is extracted from separate archive @@ -143,20 +145,30 @@ multilib_src_install() { while IFS= read -r -d '' filename; do patchelf_for_bin ${filename} ${interpreter} \; || die done - eend $? + eend ${PIPESTATUS[0]} + fi + + if use llvm-libunwind; then + ebegin "Replacing libgcc_s with libunwind" + find "${ED}/opt/${P}"/{bin,lib,libexec} -type f -print0 | \ + while IFS= read -r -d '' filename; do + # just ignore wrong filetype error, instead of checking redundantly + patchelf --replace-needed libgcc_s.so.1 libunwind.so.1 ${filename} 2>/dev/null + done + eend ${PIPESTATUS[0]} fi local symlinks=( cargo rustc rustdoc + rust-demangler rust-gdb rust-gdbgui rust-lldb ) use clippy && symlinks+=( clippy-driver cargo-clippy ) - use profiler && symlinks+=( rust-demangler ) use rustfmt && symlinks+=( rustfmt cargo-fmt ) use rust-analyzer && symlinks+=( rust-analyzer ) @@ -181,8 +193,8 @@ multilib_src_install() { CARGO_TRIPLET="${CARGO_TRIPLET//-/_}" CARGO_TRIPLET="${CARGO_TRIPLET^^}" cat <<-_EOF_ > "${T}/50${P}" - LDPATH="${EPREFIX}/usr/lib/rust/lib" - MANPATH="${EPREFIX}/usr/lib/rust/man" + LDPATH="${EPREFIX}/usr/lib/rust/lib-bin-${PV}" + MANPATH="${EPREFIX}/usr/lib/rust/man-bin-${PV}" $(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_RUSTFLAGS=\"-C target-feature=-crt-static\"") _EOF_ doenvd "${T}/50${P}" @@ -191,6 +203,7 @@ multilib_src_install() { cat <<-_EOF_ > "${T}/provider-${P}" /usr/bin/cargo /usr/bin/rustdoc + /usr/bin/rust-demangler /usr/bin/rust-gdb /usr/bin/rust-gdbgui /usr/bin/rust-lldb @@ -204,9 +217,6 @@ multilib_src_install() { echo /usr/bin/clippy-driver >> "${T}/provider-${P}" echo /usr/bin/cargo-clippy >> "${T}/provider-${P}" fi - if use profiler; then - echo /usr/bin/rust-demangler >> "${T}/provider-${P}" - fi if use rustfmt; then echo /usr/bin/rustfmt >> "${T}/provider-${P}" echo /usr/bin/cargo-fmt >> "${T}/provider-${P}" @@ -235,8 +245,10 @@ multilib_src_install() { pkg_postinst() { eselect rust update - elog "Rust installs a helper script for calling GDB now," - elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}." + if has_version dev-debug/gdb || has_version dev-debug/lldb; then + elog "Rust installs helper scripts for calling GDB and LLDB," + elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}." + fi if has_version app-editors/emacs; then elog "install app-emacs/rust-mode to get emacs support for rust." diff --git a/dev-lang/rust-bin/rust-bin-1.81.0-r100.ebuild b/dev-lang/rust-bin/rust-bin-1.81.0-r100.ebuild index 7d63e6e075b8..6fb4f440b806 100644 --- a/dev-lang/rust-bin/rust-bin-1.81.0-r100.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.81.0-r100.ebuild @@ -144,7 +144,7 @@ multilib_src_install() { while IFS= read -r -d '' filename; do patchelf_for_bin ${filename} ${interpreter} \; || die done - eend $? + eend ${PIPESTATUS[0]} fi local symlinks=( diff --git a/dev-lang/rust-bin/rust-bin-1.81.0.ebuild b/dev-lang/rust-bin/rust-bin-1.81.0-r101.ebuild index 73ab615c566f..11a6951c47d4 100644 --- a/dev-lang/rust-bin/rust-bin-1.81.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.81.0-r101.ebuild @@ -3,7 +3,10 @@ EAPI=8 -inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature +LLVM_COMPAT=( 18 ) +LLVM_OPTIONAL="yes" + +inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature MY_P="rust-${PV}" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -36,19 +39,21 @@ SRC_URI+=" ppc64? ( elibc_musl? ( ) )" LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" -SLOT="stable" -KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" +SLOT="${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix llvm-libunwind rust-analyzer rust-src rustfmt" RDEPEND=" >=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-release - sys-devel/gcc:* + !llvm-libunwind? ( sys-devel/gcc:* ) + !dev-lang/rust:stable + !dev-lang/rust-bin:stable " - BDEPEND=" prefix? ( dev-util/patchelf ) + llvm-libunwind? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) " @@ -140,7 +145,17 @@ multilib_src_install() { while IFS= read -r -d '' filename; do patchelf_for_bin ${filename} ${interpreter} \; || die done - eend $? + eend ${PIPESTATUS[0]} + fi + + if use llvm-libunwind; then + ebegin "Replacing libgcc_s with libunwind" + find "${ED}/opt/${P}"/{bin,lib,libexec} -type f -print0 | \ + while IFS= read -r -d '' filename; do + # just ignore wrong filetype error, instead of checking redundantly + patchelf --replace-needed libgcc_s.so.1 libunwind.so.1 ${filename} 2>/dev/null + done + eend ${PIPESTATUS[0]} fi local symlinks=( @@ -177,8 +192,8 @@ multilib_src_install() { CARGO_TRIPLET="${CARGO_TRIPLET//-/_}" CARGO_TRIPLET="${CARGO_TRIPLET^^}" cat <<-_EOF_ > "${T}/50${P}" - LDPATH="${EPREFIX}/usr/lib/rust/lib" - MANPATH="${EPREFIX}/usr/lib/rust/man" + LDPATH="${EPREFIX}/usr/lib/rust/lib-bin-${PV}" + MANPATH="${EPREFIX}/usr/lib/rust/man-bin-${PV}" $(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_RUSTFLAGS=\"-C target-feature=-crt-static\"") _EOF_ doenvd "${T}/50${P}" @@ -228,8 +243,10 @@ multilib_src_install() { pkg_postinst() { eselect rust update - elog "Rust installs a helper script for calling GDB now," - elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}." + if has_version dev-debug/gdb || has_version dev-debug/lldb; then + elog "Rust installs helper scripts for calling GDB and LLDB," + elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}." + fi if has_version app-editors/emacs; then optfeature "emacs support for rust" app-emacs/rust-mode diff --git a/dev-lang/rust-bin/rust-bin-1.82.0-r100.ebuild b/dev-lang/rust-bin/rust-bin-1.82.0-r100.ebuild index fcc3e706b79d..33133e19a43a 100644 --- a/dev-lang/rust-bin/rust-bin-1.82.0-r100.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.82.0-r100.ebuild @@ -146,7 +146,7 @@ multilib_src_install() { while IFS= read -r -d '' filename; do patchelf_for_bin ${filename} ${interpreter} \; || die done - eend $? + eend ${PIPESTATUS[0]} fi local symlinks=( diff --git a/dev-lang/rust-bin/rust-bin-1.82.0.ebuild b/dev-lang/rust-bin/rust-bin-1.82.0-r101.ebuild index 5ed18f6e45df..a37c975a3e4f 100644 --- a/dev-lang/rust-bin/rust-bin-1.82.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.82.0-r101.ebuild @@ -3,7 +3,10 @@ EAPI=8 -inherit multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature +LLVM_COMPAT=( 19 ) +LLVM_OPTIONAL="yes" + +inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature MY_P="rust-${PV}" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -36,19 +39,21 @@ SRC_URI+=" ppc64? ( elibc_musl? ( ) )" LICENSE="|| ( MIT Apache-2.0 ) BSD BSD-1 BSD-2 BSD-4" -SLOT="stable" +SLOT="${PV}" KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix rust-analyzer rust-src rustfmt" +IUSE="big-endian clippy cpu_flags_x86_sse2 doc prefix llvm-libunwind rust-analyzer rust-src rustfmt" RDEPEND=" >=app-eselect/eselect-rust-20190311 dev-libs/openssl sys-apps/lsb-release - sys-devel/gcc:* + !llvm-libunwind? ( sys-devel/gcc:* ) + !dev-lang/rust:stable + !dev-lang/rust-bin:stable " - BDEPEND=" prefix? ( dev-util/patchelf ) + llvm-libunwind? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) " @@ -142,7 +147,17 @@ multilib_src_install() { while IFS= read -r -d '' filename; do patchelf_for_bin ${filename} ${interpreter} \; || die done - eend $? + eend ${PIPESTATUS[0]} + fi + + if use llvm-libunwind; then + ebegin "Replacing libgcc_s with libunwind" + find "${ED}/opt/${P}"/{bin,lib,libexec} -type f -print0 | \ + while IFS= read -r -d '' filename; do + # just ignore wrong filetype error, instead of checking redundantly + patchelf --replace-needed libgcc_s.so.1 libunwind.so.1 ${filename} 2>/dev/null + done + eend ${PIPESTATUS[0]} fi local symlinks=( @@ -179,8 +194,8 @@ multilib_src_install() { CARGO_TRIPLET="${CARGO_TRIPLET//-/_}" CARGO_TRIPLET="${CARGO_TRIPLET^^}" cat <<-_EOF_ > "${T}/50${P}" - LDPATH="${EPREFIX}/usr/lib/rust/lib" - MANPATH="${EPREFIX}/usr/lib/rust/man" + LDPATH="${EPREFIX}/usr/lib/rust/lib-bin-${PV}" + MANPATH="${EPREFIX}/usr/lib/rust/man-bin-${PV}" $(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_RUSTFLAGS=\"-C target-feature=-crt-static\"") _EOF_ doenvd "${T}/50${P}" @@ -230,8 +245,10 @@ multilib_src_install() { pkg_postinst() { eselect rust update - elog "Rust installs a helper script for calling GDB now," - elog "for your convenience it is installed under /usr/bin/rust-gdb-bin-${PV}." + if has_version dev-debug/gdb || has_version dev-debug/lldb; then + elog "Rust installs helper scripts for calling GDB and LLDB," + elog "for convenience they are installed under /usr/bin/rust-{gdb,lldb}-${PV}." + fi if has_version app-editors/emacs; then optfeature "emacs support for rust" app-emacs/rust-mode |