From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 545AA158094 for ; Thu, 6 Oct 2022 16:10:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8F40EE07EA; Thu, 6 Oct 2022 16:10:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7830FE07EA for ; Thu, 6 Oct 2022 16:10:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64C6F340EAF for ; Thu, 6 Oct 2022 16:10:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B3CC655B for ; Thu, 6 Oct 2022 16:10:46 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1665072639.07da00e100b4c9ea0c6c5c790ce0c7d20aa1118f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/rust/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/rust/rust-1.62.1.ebuild dev-lang/rust/rust-1.63.0-r1.ebuild dev-lang/rust/rust-1.64.0-r1.ebuild X-VCS-Directories: dev-lang/rust/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 07da00e100b4c9ea0c6c5c790ce0c7d20aa1118f X-VCS-Branch: master Date: Thu, 6 Oct 2022 16:10:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b4b61746-6339-4487-bba7-64ee4957422c X-Archives-Hash: f573e1c05992c8790299db9cd4e41818 commit: 07da00e100b4c9ea0c6c5c790ce0c7d20aa1118f Author: Sam James gentoo org> AuthorDate: Thu Oct 6 16:09:57 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Oct 6 16:10:39 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07da00e1 dev-lang/rust: fix has_version default-libcxx test for Clang We moved the flag to sys-devel/clang-common to prepare for proper config file support (which is backported to 15.0.2, although it's going to be better in 16.x). Go for the hack for now, but keep the bug open as we want to switch to the proper link test from the LLVM ebuilds. Bug: https://bugs.gentoo.org/875563 Signed-off-by: Sam James 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 fd5d2a9b6277..b951a931e407 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]" || 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 b8cb10204eef..8f553b1aaac0 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]" || 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 92c592d49b21..436894d9af83 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]" || 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