summaryrefslogtreecommitdiff
path: root/dev-lang/rust
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-06-08 09:04:53 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-06-08 09:04:53 +0100
commit73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch)
tree2878053f3e7faed19a1f82c733d3bd29df69991e /dev-lang/rust
parent2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff)
gentoo resync : 08.06.2019
Diffstat (limited to 'dev-lang/rust')
-rw-r--r--dev-lang/rust/Manifest4
-rw-r--r--dev-lang/rust/rust-1.34.2.ebuild4
-rw-r--r--dev-lang/rust/rust-1.35.0.ebuild6
3 files changed, 9 insertions, 5 deletions
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 9dadca937728..a1948b3d1baf 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -113,6 +113,6 @@ EBUILD rust-1.30.1-r1.ebuild 8159 BLAKE2B 9f043b855ac382f79c1d13bfd1cd9c3f8d64db
EBUILD rust-1.31.1.ebuild 8157 BLAKE2B 0b22f3e299c6ba5530426630b85cb19d3a2d6065690d48c02a76c849983f0f4fd9dc1019e1ed650cb31dbc2f384112b46e4d937901c695fee8378df220c94d46 SHA512 0a64c18d348481dedb5e9165e34c86aeb8f52e6091b4fc3a3ae7d86fcd15854aaa5356eac133b25aba5ab3687b71d6d1a0ec5a6187b06ce2cb755c0f04586063
EBUILD rust-1.32.0.ebuild 8624 BLAKE2B 22d0f2cd85ed5a96edad7442f7bcb02e854e63d57d94facc0e0117759b3d91119ce9680a456507ca29738fb08efa14626419dd54ce18e161cbab1597389870f5 SHA512 7398e026113a40f222327c0d077216e0b03d7a4db625ff7d119088e957b57f105647f9ad80e8e86cd257d360f5dafbbd0e098030584f5d7fc7217607d3426c0f
EBUILD rust-1.33.0.ebuild 8706 BLAKE2B 3b06f3fab34fb5cb3e367dc819ca7f1bfbd659c07697ddb2550174afbb6ddb3f19c48fe3b3c96102204b2287445cdb1e808fe6aa4a457fadb368f00201fd34a2 SHA512 2f7af5e0d7eb14f72792b576d72a6b02131e1ca660f435ca950743be9079886aa3879640de289d3d4b87251bd969960595ffd0732283edfe53775e2a2646f45e
-EBUILD rust-1.34.2.ebuild 9515 BLAKE2B fc8bc404d3c2305bcab018694df4e9f24b32b42166d2c878d6d784d32b658003c8b1f35176399923a862631f238c174f61c5bb0d402362dd130c8e48bd158dae SHA512 473a5d99a422c9873cf44661d6641211b2a107eab9869baefebedfbabb53287628e2e522963d5a294bd9330032c0f6d5e434b0f8e259593f4410e33e514b1328
-EBUILD rust-1.35.0.ebuild 9764 BLAKE2B 1b3b476cb514a7fd0cfeb525932ee20eedfd030f05efbb9571870891ecbc368341b891cf762dfa1fddaf51397452ab3d45854c6a3139cd09c300358d74c0efce SHA512 a5ef739e070f54b78e0490df279908ace7aefc85d96df0d256e358fc6da54d4c4c109d1e98b100d8750624914bb16de897b0de6caa7396b48e9271aba1677ec4
+EBUILD rust-1.34.2.ebuild 9619 BLAKE2B a6507b9f69ba43063616cb36647d752b13b39ee11b3b522b5df211760d9f6e467c1ddeb38623b6c366d8158e6e9bd24f8280cc16267d7035c3e13b19c519a6dd SHA512 460328d7e6d228e24f849f44e705db6fba483a0038026a71e55c3c4ba1a54bb1f9b41a2571faa54696d9c6758f12a22cdbbd5b2e2ccd7ccb0c46780249bd79f3
+EBUILD rust-1.35.0.ebuild 9867 BLAKE2B 58de6eb2d6178caf33dd494ce9bb9e51a4c69407aa5bd555e7dbdd50ff5f4703f163646d8f73195dfd03983dd469ea16cb640aa81bf8c30df7f9ec2ebb77e65a SHA512 24810fb45f8615a1cb19db451cc02dae3187448a339d13a511497658efb162355a812b6781304f594f823516ccc6ee857307ee6ad63011e060e6c73fcc082aed
MISC metadata.xml 612 BLAKE2B 071fd13c4632b3025c351abcce8c72af70e0a2ed07bd3f8c01ef7ce7c5242f519bb0f27df0545eebcb22cbfba5641d3dd6399b2d33db2e5e1bdb18b89a3f39e7 SHA512 aff6c3f8708c0dbc0b61ae9ce6e9505aadcadfff71145fab0afad7034464c3452312aaa890156d9eadcb340e981b785a0855d3b3b8bd0ce1a5270e49f0d90518
diff --git a/dev-lang/rust/rust-1.34.2.ebuild b/dev-lang/rust/rust-1.34.2.ebuild
index c0d1a001cbc3..8973490b5aa2 100644
--- a/dev-lang/rust/rust-1.34.2.ebuild
+++ b/dev-lang/rust/rust-1.34.2.ebuild
@@ -267,12 +267,14 @@ src_install() {
done
# temp fix for https://bugs.gentoo.org/672816
- if use x86; then
+ # FIXME: this should handle libdir=lib, not exact arches
+ if { use x86 || use arm; }; then
local rust_target wrongdir rightdir
rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
wrongdir="${ED}/usr/$(get_libdir)/${P}/${P}/rustlib/${rust_target}/codegen-backends"
rightdir="${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/codegen-backends"
if [[ -e ${wrongdir}/librustc_codegen_llvm-llvm.so ]]; then
+ einfo "fixing bug #672816"
mv "${wrongdir}" "${rightdir}" || die
rm -r "${ED}/usr/$(get_libdir)/${P}/${P}" || die
fi
diff --git a/dev-lang/rust/rust-1.35.0.ebuild b/dev-lang/rust/rust-1.35.0.ebuild
index fb6e6ecf2739..64f0e0d63448 100644
--- a/dev-lang/rust/rust-1.35.0.ebuild
+++ b/dev-lang/rust/rust-1.35.0.ebuild
@@ -274,13 +274,15 @@ src_install() {
"${ED}/usr/${abi_libdir}" || die
done
- # temp fix for https://bugs.gentoo.org/672816
- if use x86; then
+ # temp fix for https://bugs.gentoo.org/672816
+ # FIXME: this should handle libdir=lib, not exact arches
+ if { use x86 || use arm; }; then
local rust_target wrongdir rightdir
rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
wrongdir="${ED}/usr/$(get_libdir)/${P}/${P}/rustlib/${rust_target}/codegen-backends"
rightdir="${ED}/usr/$(get_libdir)/${P}/rustlib/${rust_target}/codegen-backends"
if [[ -e ${wrongdir}/librustc_codegen_llvm-llvm.so ]]; then
+ einfo "fixing bug #672816"
mv "${wrongdir}" "${rightdir}" || die
rm -r "${ED}/usr/$(get_libdir)/${P}/${P}" || die
fi