diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-09-23 11:29:49 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-09-23 11:29:49 +0100 |
| commit | 55a7866dd6169a108d3a9e8d6696a970dea8a0b6 (patch) | |
| tree | 4a43df088b5fd8cfde3ca236a3b1566f0f1b45af /dev-lang/rust-bin | |
| parent | 7f740fcb9a0165d81bfecf7fb5da647763d76a1b (diff) | |
gentoo auto-resync : 23:09:2022 - 11:29:49
Diffstat (limited to 'dev-lang/rust-bin')
| -rw-r--r-- | dev-lang/rust-bin/Manifest | 2 | ||||
| -rw-r--r-- | dev-lang/rust-bin/rust-bin-1.64.0.ebuild | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest index 7012250f3ca7..577c475a74ad 100644 --- a/dev-lang/rust-bin/Manifest +++ b/dev-lang/rust-bin/Manifest @@ -239,5 +239,5 @@ EBUILD rust-bin-1.61.0.ebuild 6636 BLAKE2B ec6cb60a496aa25093e64e1bbf8987dde7397 EBUILD rust-bin-1.62.0.ebuild 6633 BLAKE2B 81c2d3ba738cd054efdf4362f61905726a99a3521a2188918694987999fb32bc129538b03734826bfa33f9545c118844d49a1ce2404bc77c9a54a774f321026d SHA512 15d5ef538ae16bb10b6fa323e6b8ad334c5cd67d00e5f2cde5ae7f9e7a2a268facbf609fca9b544f3fde38b68df7b1fc15eeeab4178433cb016ee0ec68d03282 EBUILD rust-bin-1.62.1.ebuild 6620 BLAKE2B d8b27d5e314f42b0af2aa17e24567d1b51250b8b42415f8f6649a2dfcfd64606fa32ce8c66a4e5cbce5de5919af45f2b39950902c50d8ac12e368bc74faa1ee8 SHA512 7eaa162b689e437f5abb541c2be57c9d69cab493071b05f30dfb7072c5287be0f3b6cb86ace1e7ce44707ad20cdac59251388ffcd6f01bdadb86df8cce56d58c EBUILD rust-bin-1.63.0.ebuild 6712 BLAKE2B abee1ad7328135967f41aff0f980268644c361635532fb72b69cc570a8225f007f71fdbabc95f95b24c0419d86fb8eaff0458053e36e9d36f9c0e6d6deb023d6 SHA512 12e29788c178768949bb1a1eb30b1c0f232af105c446619c97bfe434d0715f71fbe130bec63398fecca4d94fe959db405432a366c77720ffbc91e32c04a0aa61 -EBUILD rust-bin-1.64.0.ebuild 6851 BLAKE2B 9a095538815c536bcab08d73e730c273783e03489f673d4095414487cc0022266e1b414d2d78867f6ab137a42a5675932d70d54dc95e5a6011ef33a5eaae4095 SHA512 143d101a4e487a96731146ae91238f6884ee4ea57a633a0331d7be0ba10468a053eb11a8ef1b4d0b63665bc028f510bd12384b98c093d48a406cc017fbeb25a6 +EBUILD rust-bin-1.64.0.ebuild 6799 BLAKE2B 97837a7ed34a2a11d875f5a44175db51d9bcf7a5fb284a67a26c4eaa5c3c5d88a9f54202d4b764daeac099822e012fac43d9e2aa2ae111a6edbc2c0f63d4a9ca SHA512 0e0b5bf646fc4d337e2df72b755c7b235c226952be5f289159db280ae48adef494e2f3738c34d769fabf8287d99967d55b889fbf0f73782f3b4172b6ed1cae95 MISC metadata.xml 696 BLAKE2B d6c2665e1859a18e6b1bf7c04a0de5adda80e34b759994e158a137219e314ed0e4890a8a7f680e1b7bfb940c04e3c0b49eb3518f2fc08dcc9e19cd5fb867d02e SHA512 b93c2ab79c454d8897948e810150cb2512ca606083a2aa2135425a69ac7b7077f64e3d86f8f8b13734640a05e668a870d70003d6dc9fd3d151ca7ffcf2fb3c44 diff --git a/dev-lang/rust-bin/rust-bin-1.64.0.ebuild b/dev-lang/rust-bin/rust-bin-1.64.0.ebuild index 9e2846e0a8ac..9e7e4048e675 100644 --- a/dev-lang/rust-bin/rust-bin-1.64.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.64.0.ebuild @@ -152,12 +152,14 @@ multilib_src_install() { dosym "../../opt/${P}/lib/rustlib" "/usr/lib/rustlib-bin-${PV}" dosym "../../../opt/${P}/share/doc/rust" "/usr/share/doc/${P}" - # musl logic can be improved a bit, but fine as is for now + # make all capital underscored variable + local CARGO_TRIPLET="$(rust_abi)" + 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" - $(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"' '') + $(usev elibc_musl "CARGO_TARGET_${CARGO_TRIPLET}_RUSTFLAGS=\"-C target-feature=-crt-static\"") _EOF_ doenvd "${T}/50${P}" |