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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 074FB138335 for ; Wed, 1 Jan 2020 16:04:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F6A6E0B18; Wed, 1 Jan 2020 16:04:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22F5DE0B18 for ; Wed, 1 Jan 2020 16:04:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 26C8434DDFA for ; Wed, 1 Jan 2020 16:04:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8558AA6 for ; Wed, 1 Jan 2020 16:04:19 +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: <1577894652.be2d45b56ea9f903e544af2ea50bb8be62f264eb.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3-exe/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild X-VCS-Directories: dev-python/pypy3-exe/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: be2d45b56ea9f903e544af2ea50bb8be62f264eb X-VCS-Branch: master Date: Wed, 1 Jan 2020 16:04:19 +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: 9985d8b5-197d-4461-af94-2b7251ce7539 X-Archives-Hash: 9404f143e4825571bfd0f1008486765c commit: be2d45b56ea9f903e544af2ea50bb8be62f264eb Author: Michał Górny gentoo org> AuthorDate: Wed Jan 1 15:08:49 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Jan 1 16:04:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be2d45b5 dev-python/pypy3-exe: Fix using pypy for build Signed-off-by: Michał Górny gentoo.org> dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild index e92be6d6a81..baed59372e8 100644 --- a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild +++ b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild @@ -4,7 +4,7 @@ EAPI=7 # pypy3 needs to be built using python 2 -PYTHON_COMPAT=( python2_7 pypy ) +PYTHON_COMPAT=( python2_7 ) inherit check-reqs pax-utils python-any-r1 toolchain-funcs MY_P=pypy3.6-v${PV/_/} @@ -25,7 +25,8 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0= bzip2? ( app-arch/bzip2:0= ) ncurses? ( sys-libs/ncurses:0= ) !dev-python/pypy3-exe-bin:${PV}" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +BDEPEND=" low-memory? ( dev-python/pypy ) !low-memory? ( || ( @@ -59,16 +60,18 @@ pkg_setup() { # unset to allow forcing pypy below :) use low-memory && local EPYTHON= - if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then + if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] && + { has_version -b dev-python/pypy || + has_version -b dev-python/pypy-bin; } + then einfo "Using PyPy to perform the translation." - local EPYTHON=pypy + EPYTHON=pypy else einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream" einfo "recommends using PyPy for that. If you wish to do so, please install" einfo "dev-python/pypy and ensure that EPYTHON variable is unset." + python-any-r1_pkg_setup fi - - python-any-r1_pkg_setup fi } @@ -120,10 +123,10 @@ src_configure() { ) done - local interp=( "${PYTHON}" ) + local interp=( "${EPYTHON}" ) if use low-memory; then interp=( env PYPY_GC_MAX_DELTA=200MB - "${PYTHON}" --jit loop_longevity=300 ) + "${EPYTHON}" --jit loop_longevity=300 ) fi # translate into the C sources