commit: e51d85c825d1ad84ff357a038b1eff6411972873 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Oct 6 20:57:27 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Oct 6 21:40:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e51d85c8
dev-lang/rust: fix has_version rust check Bug: https://bugs.gentoo.org/875563 Fixes: 07da00e100b4c9ea0c6c5c790ce0c7d20aa1118f Signed-off-by: Sam James <sam <AT> gentoo.org> dev-lang/rust/rust-1.62.1.ebuild | 2 +- dev-lang/rust/rust-1.63.0-r1.ebuild | 2 +- dev-lang/rust/rust-1.64.0-r1.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-lang/rust/rust-1.62.1.ebuild b/dev-lang/rust/rust-1.62.1.ebuild index b951a931e407..14499d27ee4f 100644 --- a/dev-lang/rust/rust-1.62.1.ebuild +++ b/dev-lang/rust/rust-1.62.1.ebuild @@ -310,7 +310,7 @@ src_configure() { # https://bugs.gentoo.org/732632 if tc-is-clang; then local clang_slot="$(clang-major-version)" - if { has_version "sys-devel/clang:${clang_slot}[default-libcxx(-)]" || has_version "sys-devel/clang-common:${clang_slot}[default-libcxx(-)]" || is-flagq -stdlib=libc++; }; then + if { has_version "sys-devel/clang:${clang_slot}[default-libcxx(-)]" || has_version "=sys-devel/clang-common-${clang_slot}*[default-libcxx(-)]" || is-flagq -stdlib=libc++; }; then use_libcxx="true" fi fi diff --git a/dev-lang/rust/rust-1.63.0-r1.ebuild b/dev-lang/rust/rust-1.63.0-r1.ebuild index 8f553b1aaac0..0e8a344f1bd1 100644 --- a/dev-lang/rust/rust-1.63.0-r1.ebuild +++ b/dev-lang/rust/rust-1.63.0-r1.ebuild @@ -340,7 +340,7 @@ src_configure() { # https://bugs.gentoo.org/732632 if tc-is-clang; then local clang_slot="$(clang-major-version)" - if { has_version "sys-devel/clang:${clang_slot}[default-libcxx(-)]" || has_version "sys-devel/clang-common:${clang_slot}[default-libcxx(-)]" || is-flagq -stdlib=libc++; }; then + if { has_version "sys-devel/clang:${clang_slot}[default-libcxx(-)]" || has_version "=sys-devel/clang-common-${clang_slot}*[default-libcxx(-)]" || is-flagq -stdlib=libc++; }; then use_libcxx="true" fi fi diff --git a/dev-lang/rust/rust-1.64.0-r1.ebuild b/dev-lang/rust/rust-1.64.0-r1.ebuild index 436894d9af83..2b26a2679323 100644 --- a/dev-lang/rust/rust-1.64.0-r1.ebuild +++ b/dev-lang/rust/rust-1.64.0-r1.ebuild @@ -338,7 +338,7 @@ src_configure() { # https://bugs.gentoo.org/732632 if tc-is-clang; then local clang_slot="$(clang-major-version)" - if { has_version "sys-devel/clang:${clang_slot}[default-libcxx(-)]" || has_version "sys-devel/clang-common:${clang_slot}[default-libcxx(-)]" || is-flagq -stdlib=libc++; }; then + if { has_version "sys-devel/clang:${clang_slot}[default-libcxx(-)]" || has_version "=sys-devel/clang-common-${clang_slot}*[default-libcxx(-)]" || is-flagq -stdlib=libc++; }; then use_libcxx="true" fi fi
