commit: 04890a3be394530094e92791be60ee0dab9f3085 Author: Christopher Fore <csfore <AT> posteo <DOT> net> AuthorDate: Thu Apr 3 02:59:56 2025 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Thu Apr 3 03:54:41 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04890a3b
dev-lang/rust-bin: Remove armv7 SoftFP check This is now covered in armv7a's profile by inheriting wd40. toolchain-funcs inherit has also been removed since it is no longer needed. Signed-off-by: Christopher Fore <csfore <AT> posteo.net> Closes: https://github.com/gentoo/gentoo/pull/41370 Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> dev-lang/rust-bin/rust-bin-1.71.1-r102.ebuild | 8 +------- dev-lang/rust-bin/rust-bin-1.74.1-r102.ebuild | 8 +------- dev-lang/rust-bin/rust-bin-1.75.0-r102.ebuild | 8 +------- dev-lang/rust-bin/rust-bin-1.76.0-r101.ebuild | 8 +------- dev-lang/rust-bin/rust-bin-1.77.1-r102.ebuild | 8 +------- dev-lang/rust-bin/rust-bin-1.78.0-r102.ebuild | 8 +------- dev-lang/rust-bin/rust-bin-1.79.0-r103.ebuild | 8 +------- dev-lang/rust-bin/rust-bin-1.80.1-r103.ebuild | 8 +------- dev-lang/rust-bin/rust-bin-1.81.0-r103.ebuild | 8 +------- dev-lang/rust-bin/rust-bin-1.82.0-r103.ebuild | 8 +------- dev-lang/rust-bin/rust-bin-1.83.0-r2.ebuild | 8 +------- dev-lang/rust-bin/rust-bin-1.84.0-r2.ebuild | 8 +------- dev-lang/rust-bin/rust-bin-1.84.1-r2.ebuild | 8 +------- dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild | 8 +------- dev-lang/rust-bin/rust-bin-1.85.1.ebuild | 8 +------- dev-lang/rust-bin/rust-bin-1.86.0_beta20250323.ebuild | 8 +------- dev-lang/rust-bin/rust-bin-9999.ebuild | 8 +------- 17 files changed, 17 insertions(+), 119 deletions(-) diff --git a/dev-lang/rust-bin/rust-bin-1.71.1-r102.ebuild b/dev-lang/rust-bin/rust-bin-1.71.1-r102.ebuild index 4a8c1bec782e..0e1bf418b71d 100644 --- a/dev-lang/rust-bin/rust-bin-1.71.1-r102.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.71.1-r102.ebuild @@ -6,7 +6,7 @@ EAPI=8 LLVM_COMPAT=( 16 ) LLVM_OPTIONAL="yes" -inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal +inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal MY_P="rust-${PV}" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -74,12 +74,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" -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() { # sadly rust-src tarball does not have corresponding .asc file # so do partial verification diff --git a/dev-lang/rust-bin/rust-bin-1.74.1-r102.ebuild b/dev-lang/rust-bin/rust-bin-1.74.1-r102.ebuild index e7490ef7bbbf..c81cc6ffbdd6 100644 --- a/dev-lang/rust-bin/rust-bin-1.74.1-r102.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.74.1-r102.ebuild @@ -6,7 +6,7 @@ EAPI=8 LLVM_COMPAT=( 17 ) LLVM_OPTIONAL="yes" -inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal +inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal MY_P="rust-${PV}" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -70,12 +70,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" -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() { # sadly rust-src tarball does not have corresponding .asc file # so do partial verification diff --git a/dev-lang/rust-bin/rust-bin-1.75.0-r102.ebuild b/dev-lang/rust-bin/rust-bin-1.75.0-r102.ebuild index bb60f0c714ad..be6823b603c5 100644 --- a/dev-lang/rust-bin/rust-bin-1.75.0-r102.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.75.0-r102.ebuild @@ -6,7 +6,7 @@ EAPI=8 LLVM_COMPAT=( 17 ) LLVM_OPTIONAL="yes" -inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal +inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal MY_P="rust-${PV}" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -70,12 +70,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" -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() { # sadly rust-src tarball does not have corresponding .asc file # so do partial verification diff --git a/dev-lang/rust-bin/rust-bin-1.76.0-r101.ebuild b/dev-lang/rust-bin/rust-bin-1.76.0-r101.ebuild index a1a14f630402..6139f1a663e7 100644 --- a/dev-lang/rust-bin/rust-bin-1.76.0-r101.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.76.0-r101.ebuild @@ -6,7 +6,7 @@ EAPI=8 LLVM_COMPAT=( 17 ) LLVM_OPTIONAL="yes" -inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal +inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal MY_P="rust-${PV}" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -57,12 +57,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" -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() { # sadly rust-src tarball does not have corresponding .asc file # so do partial verification diff --git a/dev-lang/rust-bin/rust-bin-1.77.1-r102.ebuild b/dev-lang/rust-bin/rust-bin-1.77.1-r102.ebuild index 701e6ea24605..d2f7a34c7653 100644 --- a/dev-lang/rust-bin/rust-bin-1.77.1-r102.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.77.1-r102.ebuild @@ -6,7 +6,7 @@ EAPI=8 LLVM_COMPAT=( 17 ) LLVM_OPTIONAL="yes" -inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal +inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal MY_P="rust-${PV}" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -70,12 +70,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" -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() { # sadly rust-src tarball does not have corresponding .asc file # so do partial verification diff --git a/dev-lang/rust-bin/rust-bin-1.78.0-r102.ebuild b/dev-lang/rust-bin/rust-bin-1.78.0-r102.ebuild index 1b4245794425..21708bd51e28 100644 --- a/dev-lang/rust-bin/rust-bin-1.78.0-r102.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.78.0-r102.ebuild @@ -6,7 +6,7 @@ EAPI=8 LLVM_COMPAT=( 18 ) LLVM_OPTIONAL="yes" -inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal +inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal MY_P="rust-${PV}-r101" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -77,12 +77,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" -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() { # sadly rust-src tarball does not have corresponding .asc file # so do partial verification diff --git a/dev-lang/rust-bin/rust-bin-1.79.0-r103.ebuild b/dev-lang/rust-bin/rust-bin-1.79.0-r103.ebuild index 1b4245794425..21708bd51e28 100644 --- a/dev-lang/rust-bin/rust-bin-1.79.0-r103.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.79.0-r103.ebuild @@ -6,7 +6,7 @@ EAPI=8 LLVM_COMPAT=( 18 ) LLVM_OPTIONAL="yes" -inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal +inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal MY_P="rust-${PV}-r101" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -77,12 +77,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" -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() { # sadly rust-src tarball does not have corresponding .asc file # so do partial verification diff --git a/dev-lang/rust-bin/rust-bin-1.80.1-r103.ebuild b/dev-lang/rust-bin/rust-bin-1.80.1-r103.ebuild index 9f33d6b27976..106d34677112 100644 --- a/dev-lang/rust-bin/rust-bin-1.80.1-r103.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.80.1-r103.ebuild @@ -6,7 +6,7 @@ EAPI=8 LLVM_COMPAT=( 18 ) LLVM_OPTIONAL="yes" -inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal +inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal MY_P="rust-${PV}-r101" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -77,12 +77,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" -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() { # sadly rust-src tarball does not have corresponding .asc file # so do partial verification diff --git a/dev-lang/rust-bin/rust-bin-1.81.0-r103.ebuild b/dev-lang/rust-bin/rust-bin-1.81.0-r103.ebuild index 1f1b15fc8244..9a5f6a563c14 100644 --- a/dev-lang/rust-bin/rust-bin-1.81.0-r103.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.81.0-r103.ebuild @@ -6,7 +6,7 @@ EAPI=8 LLVM_COMPAT=( 18 ) LLVM_OPTIONAL="yes" -inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature +inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal optfeature MY_P="rust-${PV}-r101" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -77,12 +77,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" -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() { # sadly rust-src tarball does not have corresponding .asc file # so do partial verification diff --git a/dev-lang/rust-bin/rust-bin-1.82.0-r103.ebuild b/dev-lang/rust-bin/rust-bin-1.82.0-r103.ebuild index 9ac8de92f2e8..de51bd867a30 100644 --- a/dev-lang/rust-bin/rust-bin-1.82.0-r103.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.82.0-r103.ebuild @@ -6,7 +6,7 @@ EAPI=8 LLVM_COMPAT=( 19 ) LLVM_OPTIONAL="yes" -inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature +inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal optfeature MY_P="rust-${PV}-r102" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -77,12 +77,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" -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() { # sadly rust-src tarball does not have corresponding .asc file # so do partial verification diff --git a/dev-lang/rust-bin/rust-bin-1.83.0-r2.ebuild b/dev-lang/rust-bin/rust-bin-1.83.0-r2.ebuild index 6f9f25068b5f..8d5e2520190e 100644 --- a/dev-lang/rust-bin/rust-bin-1.83.0-r2.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.83.0-r2.ebuild @@ -6,7 +6,7 @@ EAPI=8 LLVM_COMPAT=( 19 ) LLVM_OPTIONAL="yes" -inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature +inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal optfeature MY_P="rust-${PV}-r2" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -77,12 +77,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" -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() { # sadly rust-src tarball does not have corresponding .asc file # so do partial verification diff --git a/dev-lang/rust-bin/rust-bin-1.84.0-r2.ebuild b/dev-lang/rust-bin/rust-bin-1.84.0-r2.ebuild index 99ff19978b18..8db5ba347138 100644 --- a/dev-lang/rust-bin/rust-bin-1.84.0-r2.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.84.0-r2.ebuild @@ -6,7 +6,7 @@ EAPI=8 LLVM_COMPAT=( 19 ) LLVM_OPTIONAL="yes" -inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature +inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal optfeature MY_P="rust-${PV}-r1" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -77,12 +77,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" -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() { # sadly rust-src tarball does not have corresponding .asc file # so do partial verification diff --git a/dev-lang/rust-bin/rust-bin-1.84.1-r2.ebuild b/dev-lang/rust-bin/rust-bin-1.84.1-r2.ebuild index c55c998662ee..6a6e4ce8b3d2 100644 --- a/dev-lang/rust-bin/rust-bin-1.84.1-r2.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.84.1-r2.ebuild @@ -6,7 +6,7 @@ EAPI=8 LLVM_COMPAT=( 19 ) LLVM_OPTIONAL="yes" -inherit llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature +inherit llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal optfeature MY_P="rust-${PV}-r1" # curl -L static.rust-lang.org/dist/channel-rust-${PV}.toml 2>/dev/null | grep "xz_url.*rust-src" @@ -77,12 +77,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" -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() { # sadly rust-src tarball does not have corresponding .asc file # so do partial verification diff --git a/dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild b/dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild index f76a83693d43..eefb28154549 100644 --- a/dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.85.0-r1.ebuild @@ -6,7 +6,7 @@ EAPI=8 LLVM_COMPAT=( 19 ) LLVM_OPTIONAL="yes" -inherit edo llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature +inherit edo llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal optfeature if [[ ${PV} == *9999* ]]; then # We need to fetch a tarball in src_unpack @@ -98,12 +98,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" -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() { if [[ ${PV} == *9999* ]]; then # We need to fetch the latest nightly listing and get the apprapriate src_uri for our arch diff --git a/dev-lang/rust-bin/rust-bin-1.85.1.ebuild b/dev-lang/rust-bin/rust-bin-1.85.1.ebuild index 614b762194a8..a16975a34420 100644 --- a/dev-lang/rust-bin/rust-bin-1.85.1.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.85.1.ebuild @@ -6,7 +6,7 @@ EAPI=8 LLVM_COMPAT=( 19 ) LLVM_OPTIONAL="yes" -inherit edo llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature +inherit edo llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal optfeature if [[ ${PV} == *9999* ]]; then # We need to fetch a tarball in src_unpack @@ -98,12 +98,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" -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() { if [[ ${PV} == *9999* ]]; then # We need to fetch the latest nightly listing and get the apprapriate src_uri for our arch diff --git a/dev-lang/rust-bin/rust-bin-1.86.0_beta20250323.ebuild b/dev-lang/rust-bin/rust-bin-1.86.0_beta20250323.ebuild index 97bd2bca573d..cfb49ccbed4f 100644 --- a/dev-lang/rust-bin/rust-bin-1.86.0_beta20250323.ebuild +++ b/dev-lang/rust-bin/rust-bin-1.86.0_beta20250323.ebuild @@ -6,7 +6,7 @@ EAPI=8 LLVM_COMPAT=( 19 ) LLVM_OPTIONAL="yes" -inherit edo llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature +inherit edo llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal optfeature if [[ ${PV} == *9999* ]]; then # We need to fetch a tarball in src_unpack @@ -93,12 +93,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" -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() { if [[ ${PV} == *9999* ]]; then # We need to fetch the latest nightly listing and get the apprapriate src_uri for our arch diff --git a/dev-lang/rust-bin/rust-bin-9999.ebuild b/dev-lang/rust-bin/rust-bin-9999.ebuild index 6338d2da2419..e00494d54b3b 100644 --- a/dev-lang/rust-bin/rust-bin-9999.ebuild +++ b/dev-lang/rust-bin/rust-bin-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 LLVM_COMPAT=( 20 ) LLVM_OPTIONAL="yes" -inherit edo llvm-r1 multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal optfeature +inherit edo llvm-r1 multilib prefix rust-toolchain verify-sig multilib-minimal optfeature if [[ ${PV} == *9999* ]]; then # We need to fetch a tarball in src_unpack @@ -96,12 +96,6 @@ QA_EXECSTACK="opt/${P}/lib/rustlib/*/lib*.rlib:lib.rmeta" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/rust.asc" -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() { if [[ ${PV} == *9999* ]]; then # We need to fetch the latest nightly listing and get the apprapriate src_uri for our arch
