| 1 |
commit: e93f3d4c758e1db71adb786c4c0a02825f5a3bd6 |
| 2 |
Author: stefson <herrtimson <AT> yahoo <DOT> de> |
| 3 |
AuthorDate: Mon May 28 16:30:25 2018 +0000 |
| 4 |
Commit: Dirkjan Ochtman <djc <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 29 06:25:40 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e93f3d4c |
| 7 |
|
| 8 |
dev-util/cargo: enable arm hard- and softfloat |
| 9 |
|
| 10 |
dev-util/cargo/Manifest | 6 ++++++ |
| 11 |
dev-util/cargo/cargo-0.26.0.ebuild | 11 +++++++++++ |
| 12 |
dev-util/cargo/cargo-0.27.0.ebuild | 11 +++++++++++ |
| 13 |
3 files changed, 28 insertions(+) |
| 14 |
|
| 15 |
diff --git a/dev-util/cargo/Manifest b/dev-util/cargo/Manifest |
| 16 |
index 27143e7b694..3f78c4109e3 100644 |
| 17 |
--- a/dev-util/cargo/Manifest |
| 18 |
+++ b/dev-util/cargo/Manifest |
| 19 |
@@ -10,9 +10,15 @@ DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50f |
| 20 |
DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465 |
| 21 |
DIST bufstream-0.1.3.crate 8375 BLAKE2B 6e64cfb797283f935ccf309fc054eda4c362fc482b68360619b1146698a0db5023013ded3f1c64ecfa29b55f10dcb8c230d853f5088f28da9ea1c018147d9247 SHA512 b615056dbdfb181c622acd734d7b7b67f2604161f90db81043fe109c2c7396cf81fa3a2b4878571968858311e46034072c54e3b181f9a8217aa276b2145c95b1 |
| 22 |
DIST cargo-0.25.0-aarch64-unknown-linux-gnu.tar.gz 4858889 BLAKE2B 29ca3920b083264057b9d1d0e7dcb2ad945cd42e791b24cfce353085bcdeeab467530035f3e03fdcd9323097367c8cc20aa6eba96d15421aefe2ad99973efbb4 SHA512 e1d10ff096da535e3bed5275b31d8cb95d7135adadbec4218f77c187a6cb8e992088663bd21cd8e0b40627974cfcff39f508e387e32d07da0b5be486be45c42d |
| 23 |
+DIST cargo-0.25.0-arm-unknown-linux-gnueabi.tar.gz 5828897 BLAKE2B 2b9d34839926ac3346eed98a5460551e678276c25b4c5ae62a6a43ac35d335f7ca0174f459049c58f4d7a81aafe8cecc9d2c4c9d07439d15073b2cbe5d220a9c SHA512 2e091155c9599b3a032c9d0698f64a0c1654e88a5c9df6c930063885ff0c3be6e3a8a6f9577982004e4b1c83d1c78727da8d364665da4d1a3e053bfacdaef546 |
| 24 |
+DIST cargo-0.25.0-arm-unknown-linux-gnueabihf.tar.gz 5826101 BLAKE2B 0bd4bcd574ce42f52698f2fa6d564b1292582f569a8ec547dde33668a4c8c72327fc949ed2b6d925672768ed0b7b47821d1c92d737faa9234d53c185443e0b6a SHA512 f24c4b2509824a8ff25ed6ce0ec011b019f7e6eb16ebc4382ab233db96732fd22c44dcc39d6388bcd6a6b79100eeb13ffe4188d727f4e07ceee4a5777520eaeb |
| 25 |
+DIST cargo-0.25.0-armv7-unknown-linux-gnueabihf.tar.gz 5674664 BLAKE2B e9878f6c89bd9545b65f8c1e888fc4c632377bb77a64d4084c68f50aed0553bc65bce61bc732ecabee7fc88754f9e9305d9a8c9abe3629b4e7be490338a6915f SHA512 ef2da09b121374a33a607114ab4bf0a3e87af96cadbd8757076773aea4028e1105232dc9ce0f34a90e3bfc204d2f43c056fb07c54b6b7ca0861ffb2d124de0e6 |
| 26 |
DIST cargo-0.25.0-i686-unknown-linux-gnu.tar.gz 6083273 BLAKE2B e27a6372c3a0eb607cdfc82b9e2f2b3e2d4cdb24c4548329a6fdebc0f4568a2c19bc03e1abd0f9b52f30528c8fb3b7595bede2a88de5c61f9ae2d94e55f4cbba SHA512 3bb78ec5041fc84648d94a1f144a5eb0cdb7e80e4f6fb308052d354b1916b6d279e6dcc024e9b0bd25dbc8fb1ffffaeba7b6ad413778058053aae7bdb73a6319 |
| 27 |
DIST cargo-0.25.0-x86_64-unknown-linux-gnu.tar.gz 6004007 BLAKE2B dd94d56aba7ae7bb10dc4fe3c230d56f118196d8a9ad93f59c8591da5a2c4e466655cea468eab76ae35d6ece2a1b802090c7832b870b715e2e9affd39dea8cd3 SHA512 378adc19c342cdc54179cef408517ede6075ae6e8040df5c0dd0344c33e1f2697838218c3351000c213b84e97b4cab31f51ea6c1c7c1372621a55106b1f3c5f4 |
| 28 |
DIST cargo-0.26.0-aarch64-unknown-linux-gnu.tar.xz 3060104 BLAKE2B f82d0fd5439169a0027daa406fadddc381deb35fdf806e2f9753dbd0b716b14e1a0dcc91ed036154ad36a4b42827e80bb431bcd038782386026e695075eb6f66 SHA512 b3b53bb1ab5bb6f04149667f1592f3e5b4c79c228f3b4db071507ab4b928f6990a0b4055b57ffcf1fc788f48209513dbfe4943b1620f1e1b60e770e434e03287 |
| 29 |
+DIST cargo-0.26.0-arm-unknown-linux-gnueabi.tar.xz 3670620 BLAKE2B 7f437a84bdbed165d17d6fde0c26ea0576512aaac40f5b087c336adb8324cbb119c3d822cdc0768981acba654c354381ec73cd8104822e9a7e2627bc7851ff09 SHA512 e823c02e20a6c19863d08792bea151b46acc533f1bb2823ba6a73127940fdd77f3e5f6542ee170cd0f70216fbbaf7029f91887da512b81fc343a55b646973d52 |
| 30 |
+DIST cargo-0.26.0-arm-unknown-linux-gnueabihf.tar.xz 3695968 BLAKE2B cc9c36ef582ba734792911542c65b2b779c768d2b60fbe45ba748f90f796f20684408225951d473df5044b70a76b70800d40355ca223df4343f3b739086132c6 SHA512 0eb2b64eaf30bddceb0cb10b15ddd34d6360fa2038c25116d074d7f480ea0af2ec8d2825680252894decaa88a10872dbea7b77e5a2c4923fd5fcb022b3835ea6 |
| 31 |
+DIST cargo-0.26.0-armv7-unknown-linux-gnueabihf.tar.xz 3694064 BLAKE2B 3ec8596000d2b0818e4803c93361d7a82b136a5d00c29577c951ebc73df9145d68bc0b055efd71eb9932934e132baaa0648a3493c53b6627553ae3c645f58022 SHA512 8a80f50b46b37cf1a8a90fe4841c7ef27e81791e533712fcdd8b35250c17db6199689337713667399cfff10c40b847f48466bf145b58be7a54f794e3f6b34800 |
| 32 |
DIST cargo-0.26.0-i686-unknown-linux-gnu.tar.xz 4104468 BLAKE2B 1325a2b0c4da3c4788e04f8d61f938fd7690ff031891f89d29d74f5a1c43425d4ade0b306309205782ae8624733b8f365ca033052ba95aeee730a69900a4ab3d SHA512 4e30b8091123af894493e8c704723945abaec21befabf54ba3d618d8c6586352ce02501afc0229494f99b7612b82e049fb5c35ac419282349673394c75a2c6d7 |
| 33 |
DIST cargo-0.26.0-x86_64-unknown-linux-gnu.tar.xz 4134388 BLAKE2B 961df201fa4f87308a28b217296c7927e6b67f513e7eaaf5cf12675ab4c01c50e60bf8756c2f8fafe1e4b2d7e3e5a8daa446fc1b72014828d0233209434f1dda SHA512 476041cb12a49819250d96f246d900769ab83386e584b3264b4f47ef5a2182d410a8606054a330da653cf2b2a290193c7260af5c98a29d6969b6c7c5169876ee |
| 34 |
DIST cargo-0.26.0.tar.gz 698823 BLAKE2B a16b69818c029d9e2f6a704d6c5875d2cd01d4c120b9df18c9e33df56009c58870e7f48a0a3709dabbcc88b535a0762fca3ab11069e4ba2506566f89e8773533 SHA512 0ceba204f6effb0b636b8a4cab38ae876e32d548a158cc2a67f3f80f144d4a05ce5ec44df74eb7e17a3dcd57105298dae1ac599b917c0dbb4b7386d3cf424070 |
| 35 |
|
| 36 |
diff --git a/dev-util/cargo/cargo-0.26.0.ebuild b/dev-util/cargo/cargo-0.26.0.ebuild |
| 37 |
index e913e3df62f..3d049bc2ded 100644 |
| 38 |
--- a/dev-util/cargo/cargo-0.26.0.ebuild |
| 39 |
+++ b/dev-util/cargo/cargo-0.26.0.ebuild |
| 40 |
@@ -151,6 +151,11 @@ SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz |
| 41 |
amd64? ( |
| 42 |
https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.gz |
| 43 |
) |
| 44 |
+ arm? ( |
| 45 |
+ https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabi.tar.gz |
| 46 |
+ https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabihf.tar.gz |
| 47 |
+ https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-armv7-unknown-linux-gnueabihf.tar.gz |
| 48 |
+ ) |
| 49 |
arm64? ( |
| 50 |
https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-aarch64-unknown-linux-gnu.tar.gz |
| 51 |
)" |
| 52 |
@@ -168,6 +173,12 @@ elif [[ ${ARCH} = "x86" ]]; then |
| 53 |
TRIPLE="i686-unknown-linux-gnu" |
| 54 |
elif [[ ${ARCH} = "arm64" ]]; then |
| 55 |
TRIPLE="aarch64-unknown-linux-gnu" |
| 56 |
+elif [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then |
| 57 |
+ TRIPLE="arm-unknown-linux-gnueabi" |
| 58 |
+elif [[ ${CHOST} == armv6*h* ]]; then |
| 59 |
+ TRIPLE="arm-unknown-linux-gnueabihf" |
| 60 |
+elif [[ ${CHOST} == armv7*h* ]]; then |
| 61 |
+ TRIPLE="armv7-unknown-linux-gnueabihf" |
| 62 |
fi |
| 63 |
|
| 64 |
COMMON_DEPEND="sys-libs/zlib |
| 65 |
|
| 66 |
diff --git a/dev-util/cargo/cargo-0.27.0.ebuild b/dev-util/cargo/cargo-0.27.0.ebuild |
| 67 |
index ec3ff62a6ba..da876c730da 100644 |
| 68 |
--- a/dev-util/cargo/cargo-0.27.0.ebuild |
| 69 |
+++ b/dev-util/cargo/cargo-0.27.0.ebuild |
| 70 |
@@ -139,6 +139,11 @@ SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz |
| 71 |
amd64? ( |
| 72 |
https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.xz |
| 73 |
) |
| 74 |
+ arm? ( |
| 75 |
+ https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabi.tar.xz |
| 76 |
+ https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabihf.tar.xz |
| 77 |
+ https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-armv7-unknown-linux-gnueabihf.tar.xz |
| 78 |
+ ) |
| 79 |
arm64? ( |
| 80 |
https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-aarch64-unknown-linux-gnu.tar.xz |
| 81 |
)" |
| 82 |
@@ -156,6 +161,12 @@ elif [[ ${ARCH} = "x86" ]]; then |
| 83 |
TRIPLE="i686-unknown-linux-gnu" |
| 84 |
elif [[ ${ARCH} = "arm64" ]]; then |
| 85 |
TRIPLE="aarch64-unknown-linux-gnu" |
| 86 |
+elif [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then |
| 87 |
+ TRIPLE="arm-unknown-linux-gnueabi" |
| 88 |
+elif [[ ${CHOST} == armv6*h* ]]; then |
| 89 |
+ TRIPLE="arm-unknown-linux-gnueabihf" |
| 90 |
+elif [[ ${CHOST} == armv7*h* ]]; then |
| 91 |
+ TRIPLE="armv7-unknown-linux-gnueabihf" |
| 92 |
fi |
| 93 |
|
| 94 |
COMMON_DEPEND="sys-libs/zlib |
Archives