diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-06-15 14:57:03 +0100 |
| commit | d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch) | |
| tree | 4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /dev-lang/rust | |
| parent | e748ba9741f6540f4675c23e3e37b73e822c13a4 (diff) | |
gentoo resync : 15.06.2021
Diffstat (limited to 'dev-lang/rust')
| -rw-r--r-- | dev-lang/rust/Manifest | 2 | ||||
| -rw-r--r-- | dev-lang/rust/rust-1.52.1.ebuild | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest index 18d7b2665f4b..400bdca244f5 100644 --- a/dev-lang/rust/Manifest +++ b/dev-lang/rust/Manifest @@ -76,5 +76,5 @@ DIST rustc-1.51.0-src.tar.xz.asc 801 BLAKE2B dc06d0bc40bcc5ec5ae247495b6975584a8 DIST rustc-1.52.1-src.tar.xz 115109508 BLAKE2B c5d73f5884037d287d88ba9fdaf63a36678b692e1b510920045797ab29f1660f05cda901e19411ff83ec3084c4130034c269976b1056220f3e629cff116d07f0 SHA512 55f5053ce40d4eba4663052817aef6a6275139ca229c89cd1ec44711458b412720203301d8c7975aac5720a91fcaf21847f8184f641cbb0004f722520283c73c DIST rustc-1.52.1-src.tar.xz.asc 801 BLAKE2B ea2f89289b4d9cf90a0d10148bf3494805c00e7822cc98addf0b602c35e4635bb1963d79168b395a5f7c7bd024070284fccd19757982daa0d554dcac166fd4d7 SHA512 0d692a085c017b03b8a135a28f7e6f1d7e05642d2e99f0f1fbc397e766bb8fed4b4c6b4c9157b79d9bb0c4229607dbc35711cd463c62a9966a4efb6f197de7d3 EBUILD rust-1.51.0-r2.ebuild 19950 BLAKE2B bbbd8161f81bf3b38d2e85b14c31fca6035f74b865f973ba3ec0c2d0df104159794d32cbfcd468fb6f43a6aa9f04de9154641673a8ed1c5d8bdd05fb5348f893 SHA512 edaf33029a462e15475560588ea49fc5f79581b5df1330228eaccd947d6f6848faaf6abf09d5738a7c49685e5213bada3ad2b551547c73d5908e4b122387607c -EBUILD rust-1.52.1.ebuild 19929 BLAKE2B d3c3ca62f238651220beab8931479b0a96c54f25bcf59a3f9504bdb99e6e2fd72d948104fe2ea0aa62b83ee75d3b06227675a812466f160701bfde060d71f1a6 SHA512 7d4f507dd88108fc40a3d88fffe7d0f663df1285613a854e55bcd6e1b32ece06087505b2ae45747f7e7d13084834d798e5ccf1b52891a88fb5a467c498f7aa39 +EBUILD rust-1.52.1.ebuild 20197 BLAKE2B eeaf7551bcf52ae875e17db91cddec42fb8603e47a89bbb72e4b94a5839e1904aeda8aa606caba6998ac173a0c254b996a5716edcd3ce30c9f0ce5a290d39f43 SHA512 3f2cb52bf94fbf63eee34b02855630d088fbacb997b44d6551bc9a43a3f4c9b931553638abd6319835c128113587215a9dce85bb240832719922cd49ddcdf34a MISC metadata.xml 1083 BLAKE2B 7a7b093c22dcaef58bd67f9c2fd84a000696b234d2bc27315999bf6751cfd2a79441fd22efc284a542ecc84ce1a12ff9ca3495d249eaffa5bc1722b385c6109e SHA512 bfe8c140753e93db67244c92e9a7d193691ceb67de796c30a851966a1262bc5c897ead6e13d728775fa524215b6851609dcbee582022d9d75bb8d1e6fabc4ef4 diff --git a/dev-lang/rust/rust-1.52.1.ebuild b/dev-lang/rust/rust-1.52.1.ebuild index d8b7334db884..efa716a08b92 100644 --- a/dev-lang/rust/rust-1.52.1.ebuild +++ b/dev-lang/rust/rust-1.52.1.ebuild @@ -91,7 +91,7 @@ BDEPEND="${PYTHON_DEPS} ) system-bootstrap? ( ${BOOTSTRAP_DEPEND} ) !system-llvm? ( - dev-util/cmake + >=dev-util/cmake-3.13.4 dev-util/ninja ) test? ( sys-devel/gdb ) @@ -279,10 +279,14 @@ src_configure() { local rust_stage0_root if use system-bootstrap; then - rust_stage0_root="$(rustc --print sysroot)" + local printsysroot + printsysroot="$(rustc --print sysroot || die "Can't determine rust's sysroot")" + rust_stage0_root="${printsysroot}" else rust_stage0_root="${WORKDIR}"/rust-stage0 fi + # in case of prefix it will be already prefixed, as --print sysroot returns full path + [[ -d ${rust_stage0_root} ]] || die "${rust_stage0_root} is not a directory" rust_target="$(rust_abi)" |