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 8A942138359 for ; Mon, 28 Sep 2020 09:08:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C0733E0814; Mon, 28 Sep 2020 09:08:30 +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 A2610E0814 for ; Mon, 28 Sep 2020 09:08:30 +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 B19A1340A15 for ; Mon, 28 Sep 2020 09:08:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7062F380 for ; Mon, 28 Sep 2020 09:08:28 +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: <1601284104.8ed3be6de5ac0784775ed652587c93de957cddf0.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy-exe/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/pypy-exe/pypy-exe-7.3.2.ebuild X-VCS-Directories: dev-python/pypy-exe/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 8ed3be6de5ac0784775ed652587c93de957cddf0 X-VCS-Branch: master Date: Mon, 28 Sep 2020 09:08:28 +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: c4ef22a7-a5a0-443e-95c1-892cea597e37 X-Archives-Hash: 684a7efc503355ce099a6cd952f8b3ed commit: 8ed3be6de5ac0784775ed652587c93de957cddf0 Author: Michał Górny gentoo org> AuthorDate: Mon Sep 28 07:22:14 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Sep 28 09:08:24 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ed3be6d dev-python/pypy-exe: Fix CPython bootstrap Reuse the pycparser copy bundled with cffi to avoid depending on external pycparser package, and therefore fix the build when it is not available anymore. Signed-off-by: Michał Górny gentoo.org> dev-python/pypy-exe/pypy-exe-7.3.2.ebuild | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dev-python/pypy-exe/pypy-exe-7.3.2.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.2.ebuild index 73059311188..961ae14ae10 100644 --- a/dev-python/pypy-exe/pypy-exe-7.3.2.ebuild +++ b/dev-python/pypy-exe/pypy-exe-7.3.2.ebuild @@ -31,10 +31,7 @@ BDEPEND=" !low-memory? ( || ( dev-python/pypy - ( - dev-lang/python:2.7 - dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)] - ) + dev-lang/python:2.7 ) )" @@ -140,8 +137,16 @@ src_configure() { "${EPYTHON}" --jit loop_longevity=300 ) fi + if [[ ${EPYTHON} != pypy ]]; then + # reuse bundled pycparser to avoid external dep + mkdir -p "${T}"/pymod/cffi || die + : > "${T}"/pymod/cffi/__init__.py || die + cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die + local -x PYTHONPATH=${T}/pymod:${PYTHONPATH} + fi + # translate into the C sources - # we're going to make them ourselves since otherwise pypy does not + # we're going to build them ourselves since otherwise pypy does not # free up the unneeded memory before spawning the compiler set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}" echo -e "\033[1m${@}\033[0m"