Fix another problem when bootstrapping rust.

This commit is contained in:
Andrius Štikonas 2020-05-05 01:37:55 +01:00
parent c501be0ab1
commit e311db0459
2 changed files with 7 additions and 4 deletions

View File

@ -11,7 +11,7 @@ DIST rustc-1.38.0-src.tar.xz 96163304 BLAKE2B 1e900b44db64727477ccf8e58e0ebb9ec2
DIST rustc-1.39.0-src.tar.xz 96495140 BLAKE2B 6df6bf0c3b38c28753713acdc477ea6929740c32893171dd9b8620992439e45730ef6f9489a6fc411ff5884c661ac4c07b7b93f5a4174207ed53351d2dea09bf SHA512 8610b2ec77722087c572bd84ac562a5b7c5f1a644aea58c5d5daa07a9aed242703b7816e73e2eaa049f773d5907859e259744a0de700622df005584fd798dab0
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
EBUILD rust-1.29.0.ebuild 2075 BLAKE2B 220997a6b639c6e6962170add7b2ca5a023fede1c07bf44494b028ea411d0f4111332aa6f165c845709fa8acd0a6b7c3b824358dd5d29e5bf5e65812f5f3a3ce SHA512 5f021cef1011531f469e35dc1f99453bed729b9a72d49543c84177588ff667c9607a976f23133221ba5ff77774f13bc956adc6ea457871020205e34892e94627
EBUILD rust-1.29.0.ebuild 2341 BLAKE2B 11f95dfbb502847663f4b44e4ccc173e381af340301c496c22bb4212584c2e2b97802884048859d766d32b532ab6b140249d0977d2e9d8db1fe87c79964b5af1 SHA512 2a3ce3e53ced3e7ebf6efbd353fd189685a86345915efae3d20abb2e6144c11073ee0605051d16fc55af0b54d7b4099ebee5692c71916d5cd14d3f0b6dd2b9d4
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

View File

@ -19,7 +19,7 @@ SRC_URI="
LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
SLOT="stable/1.29"
KEYWORDS="amd64 arm64"
KEYWORDS="amd64"
DEPEND="dev-util/cmake"
RDEPEND=""
@ -62,9 +62,12 @@ src_compile() {
src_install() {
mkdir -p "${D}/usr/bin/"
cp -R "${S}/run_rustc/output/prefix-s/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die "Install failed!"
rustc_wrapper=${S}/run_rustc/output/prefix/bin/rustc
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-s/lib" "${D}/usr" || 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}"
}