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 B4840158094 for ; Tue, 11 Oct 2022 07:27:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0FBF0E086A; Tue, 11 Oct 2022 07:27:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EA950E086A for ; Tue, 11 Oct 2022 07:27: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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 00A1933BE95 for ; Tue, 11 Oct 2022 07:27:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 32C70614 for ; Tue, 11 Oct 2022 07:27:46 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1665473234.6fc20622e792ab8e87fa84736fb215dc40a181e1.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/clang-common/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-devel/clang-common/clang-common-15.0.2-r1.ebuild sys-devel/clang-common/clang-common-15.0.3.9999.ebuild sys-devel/clang-common/clang-common-16.0.0.9999.ebuild sys-devel/clang-common/clang-common-16.0.0_pre20221006-r1.ebuild sys-devel/clang-common/clang-common-16.0.0_pre20221010-r1.ebuild X-VCS-Directories: sys-devel/clang-common/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 6fc20622e792ab8e87fa84736fb215dc40a181e1 X-VCS-Branch: master Date: Tue, 11 Oct 2022 07:27: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: e56922ef-04d2-4aa7-9754-1fab139c33ca X-Archives-Hash: d7bc165964129624467e85b4b71fc768 commit: 6fc20622e792ab8e87fa84736fb215dc40a181e1 Author: Michał Górny gentoo org> AuthorDate: Tue Oct 11 07:27:14 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Oct 11 07:27:14 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fc20622 sys-devel/clang-common: Adjust for gcc-config being IDEPEND Thanks to Arfrever for noticing. Signed-off-by: Michał Górny gentoo.org> sys-devel/clang-common/clang-common-15.0.2-r1.ebuild | 7 ++++++- sys-devel/clang-common/clang-common-15.0.3.9999.ebuild | 7 ++++++- sys-devel/clang-common/clang-common-16.0.0.9999.ebuild | 7 ++++++- sys-devel/clang-common/clang-common-16.0.0_pre20221006-r1.ebuild | 7 ++++++- sys-devel/clang-common/clang-common-16.0.0_pre20221010-r1.ebuild | 7 ++++++- 5 files changed, 30 insertions(+), 5 deletions(-) diff --git a/sys-devel/clang-common/clang-common-15.0.2-r1.ebuild b/sys-devel/clang-common/clang-common-15.0.2-r1.ebuild index c921dc1cf0c6..515cb176e7bd 100644 --- a/sys-devel/clang-common/clang-common-15.0.2-r1.ebuild +++ b/sys-devel/clang-common/clang-common-15.0.2-r1.ebuild @@ -26,6 +26,10 @@ PDEPEND=" default-libcxx? ( >=sys-libs/libcxx-${PV} ) default-lld? ( sys-devel/lld ) " +IDEPEND=" + !default-compiler-rt? ( sys-devel/gcc-config ) + !default-libcxx? ( sys-devel/gcc-config ) +" LLVM_COMPONENTS=( clang/utils ) llvm.org_set_globals @@ -115,7 +119,8 @@ src_install() { } pkg_preinst() { - if has_version sys-devel/gcc-config; then + if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc + then local gcc_path=$(gcc-config --get-lib-path 2>/dev/null) if [[ -n ${gcc_path} ]]; then cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF diff --git a/sys-devel/clang-common/clang-common-15.0.3.9999.ebuild b/sys-devel/clang-common/clang-common-15.0.3.9999.ebuild index 9d8ad198445d..841ceedb1077 100644 --- a/sys-devel/clang-common/clang-common-15.0.3.9999.ebuild +++ b/sys-devel/clang-common/clang-common-15.0.3.9999.ebuild @@ -29,6 +29,10 @@ PDEPEND=" default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils ) " +IDEPEND=" + !default-compiler-rt? ( sys-devel/gcc-config ) + !default-libcxx? ( sys-devel/gcc-config ) +" LLVM_COMPONENTS=( clang/utils ) llvm.org_set_globals @@ -114,7 +118,8 @@ src_install() { } pkg_preinst() { - if has_version sys-devel/gcc-config; then + if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc + then local gcc_path=$(gcc-config --get-lib-path 2>/dev/null) if [[ -n ${gcc_path} ]]; then cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF diff --git a/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild b/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild index 9d8ad198445d..841ceedb1077 100644 --- a/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild +++ b/sys-devel/clang-common/clang-common-16.0.0.9999.ebuild @@ -29,6 +29,10 @@ PDEPEND=" default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils ) " +IDEPEND=" + !default-compiler-rt? ( sys-devel/gcc-config ) + !default-libcxx? ( sys-devel/gcc-config ) +" LLVM_COMPONENTS=( clang/utils ) llvm.org_set_globals @@ -114,7 +118,8 @@ src_install() { } pkg_preinst() { - if has_version sys-devel/gcc-config; then + if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc + then local gcc_path=$(gcc-config --get-lib-path 2>/dev/null) if [[ -n ${gcc_path} ]]; then cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF diff --git a/sys-devel/clang-common/clang-common-16.0.0_pre20221006-r1.ebuild b/sys-devel/clang-common/clang-common-16.0.0_pre20221006-r1.ebuild index 9d8ad198445d..841ceedb1077 100644 --- a/sys-devel/clang-common/clang-common-16.0.0_pre20221006-r1.ebuild +++ b/sys-devel/clang-common/clang-common-16.0.0_pre20221006-r1.ebuild @@ -29,6 +29,10 @@ PDEPEND=" default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils ) " +IDEPEND=" + !default-compiler-rt? ( sys-devel/gcc-config ) + !default-libcxx? ( sys-devel/gcc-config ) +" LLVM_COMPONENTS=( clang/utils ) llvm.org_set_globals @@ -114,7 +118,8 @@ src_install() { } pkg_preinst() { - if has_version sys-devel/gcc-config; then + if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc + then local gcc_path=$(gcc-config --get-lib-path 2>/dev/null) if [[ -n ${gcc_path} ]]; then cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF diff --git a/sys-devel/clang-common/clang-common-16.0.0_pre20221010-r1.ebuild b/sys-devel/clang-common/clang-common-16.0.0_pre20221010-r1.ebuild index 9d8ad198445d..841ceedb1077 100644 --- a/sys-devel/clang-common/clang-common-16.0.0_pre20221010-r1.ebuild +++ b/sys-devel/clang-common/clang-common-16.0.0_pre20221010-r1.ebuild @@ -29,6 +29,10 @@ PDEPEND=" default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils ) " +IDEPEND=" + !default-compiler-rt? ( sys-devel/gcc-config ) + !default-libcxx? ( sys-devel/gcc-config ) +" LLVM_COMPONENTS=( clang/utils ) llvm.org_set_globals @@ -114,7 +118,8 @@ src_install() { } pkg_preinst() { - if has_version sys-devel/gcc-config; then + if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc + then local gcc_path=$(gcc-config --get-lib-path 2>/dev/null) if [[ -n ${gcc_path} ]]; then cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF