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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0D7DB158087 for ; Sat, 4 Dec 2021 19:01:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12CDE2BC016; Sat, 4 Dec 2021 19:01:27 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BF4EE2BC016 for ; Sat, 4 Dec 2021 19:01:26 +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 6ADF6343049 for ; Sat, 4 Dec 2021 19:01:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF60D1C6 for ; Sat, 4 Dec 2021 19:01:23 +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: <1638644480.72d73763a50ce8e6fcc54f7ebd84feeb7d09fee5.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/compiler-rt/compiler-rt-13.0.0.ebuild sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild X-VCS-Directories: sys-libs/compiler-rt/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 72d73763a50ce8e6fcc54f7ebd84feeb7d09fee5 X-VCS-Branch: master Date: Sat, 4 Dec 2021 19:01:23 +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: 88049ce5-3f77-489d-b920-4b37ab25dd8a X-Archives-Hash: 5410c779c02dd88ef97440c512c540bb commit: 72d73763a50ce8e6fcc54f7ebd84feeb7d09fee5 Author: Michał Górny gentoo org> AuthorDate: Sat Dec 4 18:47:03 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Dec 4 19:01:20 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72d73763 sys-libs/compiler-rt: Try to workaround Portage bug pulling py3.10 Portage has a bug where repeated Python any-of (||) dependencies cause it to wrongly pull Python 3.10 instead of being happy with the installed interpreter. Put the non-test? Python dependency into "!test?" block to work around that. Signed-off-by: Michał Górny gentoo.org> sys-libs/compiler-rt/compiler-rt-13.0.0.ebuild | 4 +++- sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild | 4 +++- sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild | 4 +++- sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.0.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.0.ebuild index 564c29b11eaa..a2d62590de11 100644 --- a/sys-libs/compiler-rt/compiler-rt-13.0.0.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-13.0.0.ebuild @@ -26,7 +26,9 @@ BDEPEND=" $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} ) - ${PYTHON_DEPS}" + !test? ( + ${PYTHON_DEPS} + )" LLVM_COMPONENTS=( compiler-rt ) LLVM_PATCHSET=${PV/_/-} diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild index 0a82b041cbde..1f0bd3af8c06 100644 --- a/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-13.0.1.9999.ebuild @@ -26,7 +26,9 @@ BDEPEND=" $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} ) - ${PYTHON_DEPS}" + !test? ( + ${PYTHON_DEPS} + )" LLVM_COMPONENTS=( compiler-rt ) LLVM_PATCHSET=9999-1 diff --git a/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild b/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild index 3c0553bcebbd..b2851d32c00e 100644 --- a/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-13.0.1_rc1.ebuild @@ -26,7 +26,9 @@ BDEPEND=" $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} ) - ${PYTHON_DEPS}" + !test? ( + ${PYTHON_DEPS} + )" LLVM_COMPONENTS=( compiler-rt ) LLVM_PATCHSET=${PV/_/-} diff --git a/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild b/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild index 3d2048549e73..98c8fe855cfe 100644 --- a/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild +++ b/sys-libs/compiler-rt/compiler-rt-14.0.0.9999.ebuild @@ -26,7 +26,9 @@ BDEPEND=" $(python_gen_any_dep ">=dev-python/lit-9.0.1[\${PYTHON_USEDEP}]") =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} ) - ${PYTHON_DEPS}" + !test? ( + ${PYTHON_DEPS} + )" LLVM_COMPONENTS=( compiler-rt cmake ) LLVM_PATCHSET=9999-1