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 D100E158086 for ; Sat, 4 Dec 2021 19:01:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 106AC2BC013; Sat, 4 Dec 2021 19:01:27 +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 AF58E2BC013 for ; Sat, 4 Dec 2021 19:01:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 55B65343040 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 C904F1D8 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: <1638644481.331b7427e495112d3047c30eaa69c9a1bf85cf84.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-libs/compiler-rt-sanitizers/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild X-VCS-Directories: sys-libs/compiler-rt-sanitizers/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 331b7427e495112d3047c30eaa69c9a1bf85cf84 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: 62fc5579-0720-4b80-885f-081948749c4d X-Archives-Hash: 4a7d85f03dd9856d01dbe971ce8a06ea commit: 331b7427e495112d3047c30eaa69c9a1bf85cf84 Author: Michał Górny gentoo org> AuthorDate: Sat Dec 4 19:00:04 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Dec 4 19:01:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=331b7427 sys-libs/compiler-rt-sanitizers: Try to stop 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-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild | 4 +++- .../compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild | 4 +++- .../compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild | 4 +++- .../compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild index 13512435fcd3..68f7e7b395dd 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.0.ebuild @@ -45,7 +45,9 @@ BDEPEND=" =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) - ${PYTHON_DEPS}" + !test? ( + ${PYTHON_DEPS} + )" LLVM_COMPONENTS=( compiler-rt ) LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild index 166db1d476f2..f89af63c6d33 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1.9999.ebuild @@ -45,7 +45,9 @@ BDEPEND=" =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) - ${PYTHON_DEPS}" + !test? ( + ${PYTHON_DEPS} + )" LLVM_COMPONENTS=( compiler-rt ) LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild index 584e656370cc..c456d296bcb8 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-13.0.1_rc1.ebuild @@ -45,7 +45,9 @@ BDEPEND=" =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) - ${PYTHON_DEPS}" + !test? ( + ${PYTHON_DEPS} + )" LLVM_COMPONENTS=( compiler-rt ) LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest ) diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild index 300f5b58df57..4e70cfd227c4 100644 --- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild +++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-14.0.0.9999.ebuild @@ -45,7 +45,9 @@ BDEPEND=" =sys-devel/clang-${PV%_*}*:${CLANG_SLOT} sys-libs/compiler-rt:${SLOT} ) - ${PYTHON_DEPS}" + !test? ( + ${PYTHON_DEPS} + )" LLVM_COMPONENTS=( compiler-rt cmake ) LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )