andrius
/
gentoo-bootstrap
1
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

rust: install cargo from run_rustc/ instead of from output/.

This commit is contained in:
Andrius Štikonas 2020-06-20 13:22:52 +01:00
parent 760217f461
commit 8ec774a93c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev-lang/rust/Manifest
View File

@ -12,7 +12,7 @@ DIST rustc-1.39.0-src.tar.xz 96495140 BLAKE2B 6df6bf0c3b38c28753713acdc477ea6929
DIST rustc-1.40.0-src.tar.xz 92306352 BLAKE2B 762b9592414e5c816540f6fd37d07b3b0ffe97a151968cc8ae77be2fda03a6d66905192985edc65055cc7811dbd90faa2b2c056481f72161c6f7ccbcce13671a SHA512 b5ac3079acefb62d3c985b77f624d7fb68de23a59396fed9ccb292db61641c064f3146ee54d3cf59067b17ebfaadd14a6b2b466def60316bb5b13ba3aef01e1f
DIST rustc-1.41.1-src.tar.xz 93754192 BLAKE2B 235ece650d0c75e1c8700ce73d3811997cd0d827b850a6dd435a269f3f86d85849d54755ea346c5ddcbe0d1224836fd78213f6abeab4a9a8c4c3e2d8a05ff7b4 SHA512 ef33565c9cf4e27ca279072bfed3301e0276c09407d49727640746ba78d289de285278d64b1cce8708461fd6c97c7ab2ea8d56e7a4c4a23b2e66e2d164c35fc9
DIST rustc-1.42.0-src.tar.xz 94186592 BLAKE2B 82298ef3da44188546bb945bcbfc1af630e6a4466b643667da08a04a33c6417afd68fc86302bdd22ab36c208fdb13cbc479e762d1217c05507bbfeb13bfbef7e SHA512 589bfdc92deedd33b8ea0df7f7c64c2a9a085fbea64936eff92f81e812309c060ed7a7adc96f6010d7adf62a68434a230da0f6c5b3540df4e0a5c6de05a31b16
EBUILD rust-1.29.0.ebuild 2270 BLAKE2B 4d7f77ebe285d68fe27ca055251df86ff2c6108a7beaa5aa4f067e499f69c5d9bc751338296129f77d94d37ba923fab3538d418c0b6433a056372196531b48e2 SHA512 c8f116bdbae3fcdcd11bb3ff4c9bf453971e42a6bcb1874da17edda4e2aac11803917128f96864264b5af367df80103eeb9f0e5b2b176452e868b7dd128bf2fc
EBUILD rust-1.29.0.ebuild 2291 BLAKE2B 29d52ef7d787db5da767531923b3c7d87b58c728161aaf0bab1edc7dcbb7260cc8b61c4f02a341ab55fff319b5a0d2ade3a39958c84c2694a8d65deb6c274ff7 SHA512 8f3e1d755a478b1434021ac0e307b637218023e6c41dd453fea8c93f83fae1d66f6118d2ee150c8f39008af8cdbc259621bc1483f791cfed01e031834540b2af
EBUILD rust-1.30.1.ebuild 7597 BLAKE2B e8caabdff29bc13354ea9ae750e44b47bd7d8b595439dbfac0f4e902b163525cbbea5613cd40d07a894906ceaeb84b1ba0cded08f502fe3865405fb88468f9b1 SHA512 78987f43bff1cc15f10df2ec6249d0fb475815717ed4e39c5efcee8d3b93a0c8443d6acd5add751361de5a49ae7dcb9b241e03db55a5919d46928f03304d6fa1
EBUILD rust-1.31.1.ebuild 7597 BLAKE2B e8caabdff29bc13354ea9ae750e44b47bd7d8b595439dbfac0f4e902b163525cbbea5613cd40d07a894906ceaeb84b1ba0cded08f502fe3865405fb88468f9b1 SHA512 78987f43bff1cc15f10df2ec6249d0fb475815717ed4e39c5efcee8d3b93a0c8443d6acd5add751361de5a49ae7dcb9b241e03db55a5919d46928f03304d6fa1
EBUILD rust-1.32.0.ebuild 7597 BLAKE2B e8caabdff29bc13354ea9ae750e44b47bd7d8b595439dbfac0f4e902b163525cbbea5613cd40d07a894906ceaeb84b1ba0cded08f502fe3865405fb88468f9b1 SHA512 78987f43bff1cc15f10df2ec6249d0fb475815717ed4e39c5efcee8d3b93a0c8443d6acd5add751361de5a49ae7dcb9b241e03db55a5919d46928f03304d6fa1

2
dev-lang/rust/rust-1.29.0.ebuild
View File

@ -65,7 +65,7 @@ src_install() {
sed -i '/LD_LIBRARY_PATH/c\LD_LIBRARY_PATH="$d\/..\/lib\/rustlib\/x86_64-unknown-linux-gnu\/lib" $d\/rustc_binary $@' ${rustc_wrapper}
cp -R "${rustc_wrapper}" "${D}/usr/bin/rustc-${PV}" || die "Install failed!"
cp -R "${S}/run_rustc/output/prefix/bin/rustc_binary" "${D}/usr/bin/rustc_binary" || die "Install failed!"
cp -R "${S}/output/cargo" "${D}/usr/bin/cargo-${PV}" || die "Install failed!"
cp -R "${S}/run_rustc/output/prefix/bin/cargo" "${D}/usr/bin/cargo-${PV}" || die "Install failed!"
cp -R "${S}/run_rustc/output/prefix/lib" "${D}/usr" || die "Install failed!"
mkdir -p "${D}/etc/env.d/rust/"
echo /usr/bin/cargo >> "${D}/etc/env.d/rust/provider-rust-${PV}"