From 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 2 Jun 2018 10:47:13 +0100 Subject: gentoo resync : 02.06.2018 --- dev-lang/rust-bin/Manifest | 10 ++++++++-- dev-lang/rust-bin/rust-bin-1.25.0.ebuild | 22 +++++++++++++++++++++- dev-lang/rust-bin/rust-bin-1.26.0.ebuild | 22 +++++++++++++++++++++- 3 files changed, 50 insertions(+), 4 deletions(-) (limited to 'dev-lang/rust-bin') diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest index c66c4df438e7..3838108d9bea 100644 --- a/dev-lang/rust-bin/Manifest +++ b/dev-lang/rust-bin/Manifest @@ -1,7 +1,13 @@ +DIST rust-1.25.0-arm-unknown-linux-gnueabi.tar.gz 152771389 BLAKE2B b163a41846233f08ba34ba325058843141b285758eede668e84d32751ace27d4b36fc5e8f963e1d13da1b46ae7cb48944987acc7ff36ced300bee154c7b22e68 SHA512 33a7bb3ed7a0b5b85e5dc0438ff620b67bc7bfe4d5e35bdcc9207a5dddf017a588a7de4877c4f1784f22f1d6e503ddd24d57f3d3af94d4bf00c781d4c378bb5f +DIST rust-1.25.0-arm-unknown-linux-gnueabihf.tar.gz 152774994 BLAKE2B 438fc55edcf80f1f292765c7d062c7c2e282c7798d0ca7312557262a7474f60341aae1c9a3f5bfe349576f7204fe1fa044dded933157b128e6c6015e23c89388 SHA512 688e8e0d2e5661f132033afe8020a93828a45d00a874155a1a7887c69590061a413db95f0443d43234fb65b5510dfd7bdb092c0cc7b3fde6abd5f386786d95ad +DIST rust-1.25.0-armv7-unknown-linux-gnueabihf.tar.gz 150376603 BLAKE2B 44aadf00b74d3d35039486289b319db5b1820dfb3b0fdbc03714ae2a8df78e09ee09fa41d9d8ec1377b91fb4a8f67cd7f4cdc99ceb39da4b48ba464ee1b73600 SHA512 a45312bec4c06b04d3c148d87a64aa55e14cc160eaaa6b712ce738590063137c8f9dd1030656071c1ac9a22cb852f34efdb98c435527c7371da381b802fb9104 DIST rust-1.25.0-i686-unknown-linux-gnu.tar.gz 169267482 BLAKE2B 8fb18c95adf7edd74cd305683ab2ee33d59cce1a0f515e9ba63dfd105ffaf9150444e281502747856fa5164f24707b4bbbe110a2b1b7a1cf65c96b883a6f2ede SHA512 76bcd978b9b23b0fc6315f91bed153e59616aa62f520aae8e8d3587b5f5fae74fef15f8b0a749b02a69be56fad4df9a413019438135481917bca1fb1a7704de7 DIST rust-1.25.0-x86_64-unknown-linux-gnu.tar.gz 178696930 BLAKE2B 0f82e837494d394c86462583f3d65f1ad839a97eda00fbc00476d06255831088cb7e554cc14edbf9dd23fbebf75078dc78204bdbec4795781f7fae0cbb6de63d SHA512 544e85bb69359d8ff6059d0f470b5995822f73e6d361be43f69f87d394b7252a11686f835336930bc257ba4347c0498abf5b1fbd751180d96bd9ca872b76d65c +DIST rust-1.26.0-arm-unknown-linux-gnueabi.tar.xz 98262664 BLAKE2B 1de2aeef6d035f9f5a4238ad0c730baabfa39944a0cc47ab31fb51b1dd7f606688a4e9c7cd323e7a4998601fce4ebd0102e2d011cfff3caa3a20f91579442cd4 SHA512 44fdff800a6da1929ccab717f544add5a0500856b4ae1edbd6202d5d8b9781bd336c75c857ddf40e6f7175916fb026210bc5ec2656f4b564dd69cc9189bda3d6 +DIST rust-1.26.0-arm-unknown-linux-gnueabihf.tar.xz 98490960 BLAKE2B ad4210bc39d11974f0a5032f6779b4c8ca04f705da8c15a755d5072d157724896a65fc149c16c6f9a479f0c61a6cb0a70d90e48543f6d72725de6baf25d4a94b SHA512 3822303a7a8c567f3a917f4c934f1411fd606a335d5f6e574dd0be9d463e9fe27ff948c820b25a305e53d83b5d9fa0e1cbfca86451a0b3e11ff84ef7a82f65c8 +DIST rust-1.26.0-armv7-unknown-linux-gnueabihf.tar.xz 98788032 BLAKE2B 3727effee1eaf89d979e27f339901ac938acc22d9dd8e664c20941e46db8250f349493f65598243d5234539bb2037e9dabd38f1a047dd8f9bbe20ae2c8270747 SHA512 5766dbba6f4faae3e8dfd1d98ea948e3835d5b1c28b8daf6c734afd7f27301aa857147eb28762462f77c9da539aae2a81319f194154245abd5cdae7067f24d6c DIST rust-1.26.0-i686-unknown-linux-gnu.tar.xz 143003764 BLAKE2B 4c0b1872196c21bf9bc9d927455b4c8eb379e40281ef9fdd8a440b702b919628a00bf2e7b392084e8f41f30119c93bfa6e57ba47ee1adecb1d5cdda43778f821 SHA512 1257f9edefc49ee1742c3acd666d15f077c4d999a82dfe0d574df5c41981c3f716adf86b23d96cf9a6757508aea92abcbe06ad9e3bec2cb4ac19512d60ebba31 DIST rust-1.26.0-x86_64-unknown-linux-gnu.tar.xz 139246408 BLAKE2B dc386c7b9e016bdcb8b2475d789b100922defc0bcd400476e4e618f51c338338edfc463428c9fa0fdcf8f051465a126d1c61030c5881d5c21888e80b8068bad8 SHA512 457503fea324251a92f25d0d45f1e2ac7d342a6a8f52d1abe93a579c7ae9b7f453a707d353e82614b37790747e8551f9762188ee25ff883495598cbf17b3f97e -EBUILD rust-bin-1.25.0.ebuild 2693 BLAKE2B c59f4ca19ea4620dffa79c6377491dbc6474365beecff4ccd80da5e5b0cdc106abd7ab9065a73cc547e5454353c35e82858f1f9e32f9074a03d319000ba5b2ff SHA512 cd196a6c3cc687455001c05c971ceca09b2cb799f246ba90cb6396c22397145975ff8362b4ccb7ee5d43933fb5d3e22d988ab2d5e997a9bd0bfe23c4113113c9 -EBUILD rust-bin-1.26.0.ebuild 2828 BLAKE2B 0cb9e6c214dbec3aefb112ec8d266fe5f9b07af225107912425ddb68b6f89cb8430fa626e599822aec79d1255901c49e555518551d1eb161eb9a27ba4080677f SHA512 667f127494ec6d3e81c0064b631ec818488da25fa5e828e5df3187bd33aa5fe48da8098ed9fb257d7334ef95ea7fa4bdf4244e455f72c537ead4355235e6096b +EBUILD rust-bin-1.25.0.ebuild 3450 BLAKE2B 473a4e4bbe1c84ed84641810a1231a53f10845bb598cd44a9de5db6b050aa843ba875ab5dc1859697d006d535bdc2cad671ff0bc5d16d54090e26bb147ba8117 SHA512 ce0b76d6efc5e875a959a2980d74d95297563c25071db915a8fc3e71dec2ab14fdf299189dee65856e04df5d4a987f046ee38f7724411ac0fd8edb1192167b95 +EBUILD rust-bin-1.26.0.ebuild 3585 BLAKE2B 3ae5644e7ccd922d703aa37813889ef8397354e47125cc5a8742384243208964d5c3be812d99393c1e63419ab3fadd235e24eb66dbb9a7d3bd1b97f41dc2c701 SHA512 a13c65f5c5f7ae9d9139234a5d7eefc9fc31f38b6bf6f201cbd7b33a7b7d4c6bfd4c3c4999609a0b3744189e389bf7a187f3b557b2d6fbb4a09efa9a825e0b3b MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0 diff --git a/dev-lang/rust-bin/rust-bin-1.25.0.ebuild b/dev-lang/rust-bin/rust-bin-1.25.0.ebuild index 056d9f3f6c27..edd1c8706d66 100644 --- a/dev-lang/rust-bin/rust-bin-1.25.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.25.0.ebuild @@ -3,13 +3,18 @@ EAPI=5 -inherit eutils bash-completion-r1 +inherit eutils bash-completion-r1 toolchain-funcs MY_P="rust-${PV}" DESCRIPTION="Systems programming language from Mozilla" HOMEPAGE="http://www.rust-lang.org/" SRC_URI="amd64? ( http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.gz ) + arm? ( + http://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabi.tar.gz + http://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabihf.tar.gz + http://static.rust-lang.org/dist/${MY_P}-armv7-unknown-linux-gnueabihf.tar.gz + ) x86? ( http://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.gz )" LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" @@ -30,11 +35,26 @@ QA_PREBUILT=" opt/${P}/lib/rustlib/*/lib/*.rlib* " +pkg_pretend () { + if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then + die "${CHOST} is not supported by upstream Rust. You must use a hard float version." + fi +} + src_unpack() { default local postfix use amd64 && postfix=x86_64-unknown-linux-gnu + + if use arm && [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then + postfix=arm-unknown-linux-gnueabi + elif use arm && [[ ${CHOST} == armv6*h* ]]; then + postfix=arm-unknown-linux-gnueabihf + elif use arm && [[ ${CHOST} == armv7*h* ]]; then + postfix=armv7-unknown-linux-gnueabihf + fi + use x86 && postfix=i686-unknown-linux-gnu mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die } diff --git a/dev-lang/rust-bin/rust-bin-1.26.0.ebuild b/dev-lang/rust-bin/rust-bin-1.26.0.ebuild index 4ee6eb84f3bc..c93726320822 100644 --- a/dev-lang/rust-bin/rust-bin-1.26.0.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.26.0.ebuild @@ -3,13 +3,18 @@ EAPI=5 -inherit eutils bash-completion-r1 versionator +inherit eutils bash-completion-r1 versionator toolchain-funcs MY_P="rust-${PV}" DESCRIPTION="Systems programming language from Mozilla" HOMEPAGE="http://www.rust-lang.org/" SRC_URI="amd64? ( http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.xz ) + arm? ( + http://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabi.tar.xz + http://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabihf.tar.xz + http://static.rust-lang.org/dist/${MY_P}-armv7-unknown-linux-gnueabihf.tar.xz + ) x86? ( http://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.xz )" LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA" @@ -33,11 +38,26 @@ QA_PREBUILT=" opt/${P}/lib/rustlib/*/lib/*.rlib* " +pkg_pretend () { + if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then + die "${CHOST} is not supported by upstream Rust. You must use a hard float version." + fi +} + src_unpack() { default local postfix use amd64 && postfix=x86_64-unknown-linux-gnu + + if use arm && [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then + postfix=arm-unknown-linux-gnueabi + elif use arm && [[ ${CHOST} == armv6*h* ]]; then + postfix=arm-unknown-linux-gnueabihf + elif use arm && [[ ${CHOST} == armv7*h* ]]; then + postfix=armv7-unknown-linux-gnueabihf + fi + use x86 && postfix=i686-unknown-linux-gnu mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die } -- cgit v1.2.3