mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
dev-python/pypy3-exe: Remove old
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
@@ -1,7 +1,2 @@
|
||||
DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
|
||||
DIST pypy3.6-v7.3.2-src.tar.bz2 22736022 BLAKE2B e2338ac3f7af06b987c43e93eab9ff14d46262143472b0393b30b011fff67d33add45d8198cee7109354e09c52a2540938abeef364b0cf12f2891ca9c7aac2a4 SHA512 ed861a57d6edf1548c061d10295313a05d0ac54fe68a8755211ff76fa2dc78d7b1479c6152dc5d0d1cdce4e247c240c1a2edf59ec8a53d0004ec7713514c9c35
|
||||
DIST pypy3.6-v7.3.3-src.tar.bz2 22484684 BLAKE2B a252e3070ec1c7cfd708cd694bd461d56241100463bac5ff7bbcf2d2667e01990ec8b4ceb947449ab1f620d0d5a8984bd8af3e2565555e5f73218e3c35ae1ebd SHA512 3bc9d9cc362f500e9e79c2694fc355706ac44d6dd5b8f5fb4d017d0997581472a9fdda08ccbe45469c7b52facdc0512be07843ba54d1d691fdb37f6628065879
|
||||
DIST pypy3.6-v7.3.3rc1-src.tar.bz2 22401663 BLAKE2B 278b71a3b608999ee20b6558598eda453f3a87645965b8b705a11d05784722106c04b405375f62bd8e7ce2968df311314ee1672a2ddecb0f6afc49a3cbe8e670 SHA512 d865125925603e74412be7e750ab403670f05e76f2dfe6280c8b0ef123ed3e2f463d9457b65aa4f84c47a3529b2d3bca84b84307623bf995f60b549c85dcce2d
|
||||
DIST pypy3.7-v7.3.2-src.tar.bz2 25060911 BLAKE2B 35ecfee4c64e13539827c65a61e0cd359de4046f77553629cdf63479327c6ad86afd1443caa7a911a6271f496f0f3caf1b919ce91de717d0a71d008927b7f77b SHA512 563a9cf63e818b95aeb14c25b55bb5fb0bf8283f0b9f2bdd9a8833989beb651681f53f52368fb9db2c75fb60be0456eec87d48b557740b57847c4104003cb288
|
||||
DIST pypy3.7-v7.3.3-src.tar.bz2 24633503 BLAKE2B 0fb9fbb8866cf661c5b1d8d029fb2bc50737fae097875d0dac86c9ec21dc907093173b350a4f89d2c5a1fbed4c92ca4919f047536b828d4ee35583d615e7ddce SHA512 c98955e72dc0bd0452e4e16e0fe0ab318a34d6d57217ea33349e98ed047597ba97be7d15b41edd4dc85028fcca0a6257a4bb98fe96ce876e41a04df012261f4a
|
||||
DIST pypy3.7-v7.3.3rc1-src.tar.bz2 24511164 BLAKE2B 7fba1fde1bb248006f95fbb52dd9f237086f7221b99d6a288c1a32188a76ed76b1908e7f2054fd969b597c422c566214dd1e9ec409e243a776e8fa466fbf2039 SHA512 f98e7d209f75c4fa5645db16e1cc721ba80d44ad76030bd1c412800bb723ba528a83da89c8793a7e105d8391e72eeef7cb0198f9b30041178e90b628f14e5a3e
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
From 913e0dae8ac7ce8219a5f31126fee8a794cc314c Mon Sep 17 00:00:00 2001
|
||||
From: Armin Rigo <arigo@tunes.org>
|
||||
Date: Sat, 26 Sep 2020 09:26:24 +0200
|
||||
Subject: [PATCH] oops, fix for test_gc_indexed_box_plus_large_offset
|
||||
|
||||
---
|
||||
rpython/jit/backend/ppc/opassembler.py | 16 +++++++++++-----
|
||||
rpython/jit/backend/ppc/regalloc.py | 4 ++--
|
||||
2 files changed, 13 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/rpython/jit/backend/ppc/opassembler.py b/rpython/jit/backend/ppc/opassembler.py
|
||||
index b79b18e530..4bbfbba93a 100644
|
||||
--- a/rpython/jit/backend/ppc/opassembler.py
|
||||
+++ b/rpython/jit/backend/ppc/opassembler.py
|
||||
@@ -755,13 +755,19 @@ class FieldOpAssembler(object):
|
||||
def _apply_offset(self, index_loc, ofs_loc):
|
||||
# If offset != 0 then we have to add it here. Note that
|
||||
# mc.addi() would not be valid with operand r0.
|
||||
- assert ofs_loc.is_imm() # must be an immediate...
|
||||
- assert _check_imm_arg(ofs_loc.getint()) # ...that fits 16 bits
|
||||
assert index_loc.is_core_reg()
|
||||
assert index_loc is not r.SCRATCH2
|
||||
- # (simplified version of _apply_scale())
|
||||
- if ofs_loc.value > 0:
|
||||
- self.mc.addi(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
|
||||
+ if ofs_loc.is_imm():
|
||||
+ # if it is an immediate, it must fit into 16 bits
|
||||
+ assert _check_imm_arg(ofs_loc.getint())
|
||||
+ # (simplified version of _apply_scale())
|
||||
+ if ofs_loc.value != 0:
|
||||
+ self.mc.addi(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
|
||||
+ index_loc = r.SCRATCH2
|
||||
+ else:
|
||||
+ # larger immediates are loaded into a register in regalloc.py
|
||||
+ assert ofs_loc.is_core_reg()
|
||||
+ self.mc.add(r.SCRATCH2.value, index_loc.value, ofs_loc.value)
|
||||
index_loc = r.SCRATCH2
|
||||
return index_loc
|
||||
|
||||
diff --git a/rpython/jit/backend/ppc/regalloc.py b/rpython/jit/backend/ppc/regalloc.py
|
||||
index f3ee1129e4..827953cf12 100644
|
||||
--- a/rpython/jit/backend/ppc/regalloc.py
|
||||
+++ b/rpython/jit/backend/ppc/regalloc.py
|
||||
@@ -771,7 +771,7 @@ class Regalloc(BaseRegalloc, VectorRegalloc):
|
||||
value_loc = self.ensure_reg(op.getarg(2))
|
||||
assert op.getarg(3).getint() == 1 # scale
|
||||
ofs_loc = self.ensure_reg_or_16bit_imm(op.getarg(4))
|
||||
- assert ofs_loc.is_imm() # the arg(4) should always be a small constant
|
||||
+ # the arg(4) is often a small constant, but it may be too large
|
||||
size_loc = self.ensure_reg_or_any_imm(op.getarg(5))
|
||||
return [base_loc, index_loc, value_loc, ofs_loc, size_loc]
|
||||
|
||||
@@ -780,7 +780,7 @@ class Regalloc(BaseRegalloc, VectorRegalloc):
|
||||
index_loc = self.ensure_reg(op.getarg(1))
|
||||
assert op.getarg(2).getint() == 1 # scale
|
||||
ofs_loc = self.ensure_reg_or_16bit_imm(op.getarg(3))
|
||||
- assert ofs_loc.is_imm() # the arg(3) should always be a small constant
|
||||
+ # the arg(3) is often a small constant, but it may be too large
|
||||
self.free_op_vars()
|
||||
res_loc = self.force_allocate_reg(op)
|
||||
size_box = op.getarg(4)
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
From 5ee2925459372a8af805e952f433acd75e426325 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
|
||||
Date: Sun, 4 Oct 2020 15:46:23 +0200
|
||||
Subject: [PATCH] Fix sethostname() failure when passed bytes
|
||||
|
||||
My implementation of sethostname() was broken and failed when passed
|
||||
bytes on Python 3. Update the implementation to match CPython -- that
|
||||
is, use bytes if provided, or fsencode() when str is provided.
|
||||
|
||||
--HG--
|
||||
branch : py3.6
|
||||
---
|
||||
pypy/module/_socket/interp_func.py | 8 +++++++-
|
||||
pypy/module/_socket/test/test_sock_app.py | 12 ++++++++++++
|
||||
2 files changed, 19 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/pypy/module/_socket/interp_func.py b/pypy/module/_socket/interp_func.py
|
||||
index bdc4f1293f..1727e51d51 100644
|
||||
--- a/pypy/module/_socket/interp_func.py
|
||||
+++ b/pypy/module/_socket/interp_func.py
|
||||
@@ -392,7 +392,13 @@ if hasattr(rsocket, 'sethostname'):
|
||||
|
||||
Set the host name.
|
||||
"""
|
||||
- hostname = space.text_w(w_hostname)
|
||||
+ if space.isinstance_w(w_hostname, space.w_bytes):
|
||||
+ hostname = space.bytes_w(w_hostname)
|
||||
+ elif space.isinstance_w(w_hostname, space.w_unicode):
|
||||
+ hostname = space.fsencode_w(w_hostname)
|
||||
+ else:
|
||||
+ raise oefmt(space.w_TypeError,
|
||||
+ "sethostname() argument 1 must be str or bytes")
|
||||
try:
|
||||
res = rsocket.sethostname(hostname)
|
||||
except SocketError as e:
|
||||
diff --git a/pypy/module/_socket/test/test_sock_app.py b/pypy/module/_socket/test/test_sock_app.py
|
||||
index fe3efec8e3..355fb8a2a9 100644
|
||||
--- a/pypy/module/_socket/test/test_sock_app.py
|
||||
+++ b/pypy/module/_socket/test/test_sock_app.py
|
||||
@@ -210,6 +210,18 @@ def test_getaddrinfo(space, w_socket):
|
||||
assert space.unwrap(w_l) == True
|
||||
|
||||
|
||||
+def test_sethostname(space, w_socket):
|
||||
+ space.raises_w(space.w_OSError, space.appexec,
|
||||
+ [w_socket],
|
||||
+ "(_socket): _socket.sethostname(_socket.gethostname())")
|
||||
+
|
||||
+
|
||||
+def test_sethostname_bytes(space, w_socket):
|
||||
+ space.raises_w(space.w_OSError, space.appexec,
|
||||
+ [w_socket],
|
||||
+ "(_socket): _socket.sethostname(_socket.gethostname().encode())")
|
||||
+
|
||||
+
|
||||
def test_unknown_addr_as_object(space, ):
|
||||
from pypy.module._socket.interp_socket import addr_as_object
|
||||
c_addr = lltype.malloc(rsocket._c.sockaddr, flavor='raw', track_allocation=False)
|
||||
--
|
||||
GitLab
|
||||
|
||||
@@ -1,151 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
# pypy3 needs to be built using python 2
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit check-reqs pax-utils python-any-r1 toolchain-funcs
|
||||
|
||||
MY_P=pypy3.6-v${PV/_/}
|
||||
DESCRIPTION="PyPy3 executable (build from source)"
|
||||
HOMEPAGE="https://pypy.org/"
|
||||
SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
|
||||
S="${WORKDIR}/${MY_P}-src"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="${PV}"
|
||||
KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
|
||||
|
||||
RDEPEND=">=sys-libs/zlib-1.1.3:0=
|
||||
dev-libs/libffi:0=
|
||||
virtual/libintl:0=
|
||||
dev-libs/expat:0=
|
||||
bzip2? ( app-arch/bzip2:0= )
|
||||
ncurses? ( sys-libs/ncurses:0= )
|
||||
!dev-python/pypy3-exe-bin:${PV}"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
low-memory? ( dev-python/pypy )
|
||||
!low-memory? (
|
||||
|| (
|
||||
dev-python/pypy
|
||||
(
|
||||
dev-lang/python:2.7
|
||||
dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
|
||||
)
|
||||
)
|
||||
)"
|
||||
|
||||
check_env() {
|
||||
if use low-memory; then
|
||||
CHECKREQS_MEMORY="1750M"
|
||||
use amd64 && CHECKREQS_MEMORY="3500M"
|
||||
else
|
||||
CHECKREQS_MEMORY="3G"
|
||||
use amd64 && CHECKREQS_MEMORY="6G"
|
||||
fi
|
||||
|
||||
check-reqs_pkg_pretend
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && check_env
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
check_env
|
||||
|
||||
# unset to allow forcing pypy below :)
|
||||
use low-memory && EPYTHON=
|
||||
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."
|
||||
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
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC
|
||||
|
||||
local jit_backend
|
||||
if use jit; then
|
||||
jit_backend='--jit-backend='
|
||||
|
||||
# We only need the explicit sse2 switch for x86.
|
||||
# On other arches we can rely on autodetection which uses
|
||||
# compiler macros. Plus, --jit-backend= doesn't accept all
|
||||
# the modern values...
|
||||
|
||||
if use x86; then
|
||||
if use cpu_flags_x86_sse2; then
|
||||
jit_backend+=x86
|
||||
else
|
||||
jit_backend+=x86-without-sse2
|
||||
fi
|
||||
else
|
||||
jit_backend+=auto
|
||||
fi
|
||||
fi
|
||||
|
||||
local args=(
|
||||
--no-shared
|
||||
$(usex jit -Ojit -O2)
|
||||
|
||||
${jit_backend}
|
||||
|
||||
pypy/goal/targetpypystandalone
|
||||
)
|
||||
|
||||
# Avoid linking against libraries disabled by use flags
|
||||
local opts=(
|
||||
bzip2:bz2
|
||||
ncurses:_minimal_curses
|
||||
)
|
||||
|
||||
local opt
|
||||
for opt in "${opts[@]}"; do
|
||||
local flag=${opt%:*}
|
||||
local mod=${opt#*:}
|
||||
|
||||
args+=(
|
||||
$(usex ${flag} --withmod --withoutmod)-${mod}
|
||||
)
|
||||
done
|
||||
|
||||
local interp=( "${EPYTHON}" )
|
||||
if use low-memory; then
|
||||
interp=( env PYPY_GC_MAX_DELTA=200MB
|
||||
"${EPYTHON}" --jit loop_longevity=300 )
|
||||
fi
|
||||
|
||||
# translate into the C sources
|
||||
# we're going to make 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"
|
||||
"${@}" || die "translation failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -C "${T}"/usession*-0/testing_1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dest=/usr/lib/pypy3.6
|
||||
exeinto "${dest}"
|
||||
newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV}
|
||||
insinto "${dest}"/include/${PV}
|
||||
doins include/pypy_*
|
||||
pax-mark m "${ED}${dest}/pypy3-c-${PV}"
|
||||
}
|
||||
@@ -1,161 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
# pypy3 needs to be built using python 2
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit check-reqs pax-utils python-any-r1 toolchain-funcs
|
||||
|
||||
MY_P=pypy3.6-v${PV/_/}
|
||||
DESCRIPTION="PyPy3 executable (build from source)"
|
||||
HOMEPAGE="https://pypy.org/"
|
||||
SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
|
||||
S="${WORKDIR}/${MY_P}-src"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="${PV}"
|
||||
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
|
||||
|
||||
RDEPEND=">=sys-libs/zlib-1.1.3:0=
|
||||
dev-libs/libffi:0=
|
||||
virtual/libintl:0=
|
||||
dev-libs/expat:0=
|
||||
bzip2? ( app-arch/bzip2:0= )
|
||||
ncurses? ( sys-libs/ncurses:0= )
|
||||
!dev-python/pypy3-exe-bin:${PV}"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
low-memory? ( dev-python/pypy )
|
||||
!low-memory? (
|
||||
|| (
|
||||
dev-python/pypy
|
||||
dev-lang/python:2.7
|
||||
)
|
||||
)"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/pypy3-7.3.2-sethostname-bytes.patch
|
||||
"${FILESDIR}"/pypy3-7.3.2-ppc64-segfault.patch
|
||||
)
|
||||
|
||||
check_env() {
|
||||
if use low-memory; then
|
||||
CHECKREQS_MEMORY="1750M"
|
||||
use amd64 && CHECKREQS_MEMORY="3500M"
|
||||
else
|
||||
CHECKREQS_MEMORY="3G"
|
||||
use amd64 && CHECKREQS_MEMORY="6G"
|
||||
fi
|
||||
|
||||
check-reqs_pkg_pretend
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && check_env
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
check_env
|
||||
|
||||
# unset to allow forcing pypy below :)
|
||||
use low-memory && EPYTHON=
|
||||
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."
|
||||
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
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC
|
||||
|
||||
local jit_backend
|
||||
if use jit; then
|
||||
jit_backend='--jit-backend='
|
||||
|
||||
# We only need the explicit sse2 switch for x86.
|
||||
# On other arches we can rely on autodetection which uses
|
||||
# compiler macros. Plus, --jit-backend= doesn't accept all
|
||||
# the modern values...
|
||||
|
||||
if use x86; then
|
||||
if use cpu_flags_x86_sse2; then
|
||||
jit_backend+=x86
|
||||
else
|
||||
jit_backend+=x86-without-sse2
|
||||
fi
|
||||
else
|
||||
jit_backend+=auto
|
||||
fi
|
||||
fi
|
||||
|
||||
local args=(
|
||||
--no-shared
|
||||
$(usex jit -Ojit -O2)
|
||||
|
||||
${jit_backend}
|
||||
|
||||
pypy/goal/targetpypystandalone
|
||||
)
|
||||
|
||||
# Avoid linking against libraries disabled by use flags
|
||||
local opts=(
|
||||
bzip2:bz2
|
||||
ncurses:_minimal_curses
|
||||
)
|
||||
|
||||
local opt
|
||||
for opt in "${opts[@]}"; do
|
||||
local flag=${opt%:*}
|
||||
local mod=${opt#*:}
|
||||
|
||||
args+=(
|
||||
$(usex ${flag} --withmod --withoutmod)-${mod}
|
||||
)
|
||||
done
|
||||
|
||||
local interp=( "${EPYTHON}" )
|
||||
if use low-memory; then
|
||||
interp=( env PYPY_GC_MAX_DELTA=200MB
|
||||
"${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 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"
|
||||
"${@}" || die "translation failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -C "${T}"/usession*-0/testing_1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dest=/usr/lib/pypy3.6
|
||||
exeinto "${dest}"
|
||||
newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV}
|
||||
insinto "${dest}"/include/${PV}
|
||||
doins include/pypy_*
|
||||
pax-mark m "${ED}${dest}/pypy3-c-${PV}"
|
||||
}
|
||||
@@ -1,162 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
# pypy3 needs to be built using python 2
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit check-reqs pax-utils python-any-r1 toolchain-funcs
|
||||
|
||||
PYPY_PV=${PV%_p37}
|
||||
MY_P=pypy3.7-v${PYPY_PV/_/}
|
||||
DESCRIPTION="PyPy3 executable (build from source)"
|
||||
HOMEPAGE="https://pypy.org/"
|
||||
SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
|
||||
S="${WORKDIR}/${MY_P}-src"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="${PV}"
|
||||
KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
|
||||
|
||||
RDEPEND=">=sys-libs/zlib-1.1.3:0=
|
||||
dev-libs/libffi:0=
|
||||
virtual/libintl:0=
|
||||
dev-libs/expat:0=
|
||||
bzip2? ( app-arch/bzip2:0= )
|
||||
ncurses? ( sys-libs/ncurses:0= )
|
||||
!dev-python/pypy3-exe-bin:${PV}"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
low-memory? ( dev-python/pypy )
|
||||
!low-memory? (
|
||||
|| (
|
||||
dev-python/pypy
|
||||
dev-lang/python:2.7
|
||||
)
|
||||
)"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/pypy3-7.3.2-sethostname-bytes.patch
|
||||
"${FILESDIR}"/pypy3-7.3.2-ppc64-segfault.patch
|
||||
)
|
||||
|
||||
check_env() {
|
||||
if use low-memory; then
|
||||
CHECKREQS_MEMORY="1750M"
|
||||
use amd64 && CHECKREQS_MEMORY="3500M"
|
||||
else
|
||||
CHECKREQS_MEMORY="3G"
|
||||
use amd64 && CHECKREQS_MEMORY="6G"
|
||||
fi
|
||||
|
||||
check-reqs_pkg_pretend
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && check_env
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
check_env
|
||||
|
||||
# unset to allow forcing pypy below :)
|
||||
use low-memory && EPYTHON=
|
||||
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."
|
||||
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
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC
|
||||
|
||||
local jit_backend
|
||||
if use jit; then
|
||||
jit_backend='--jit-backend='
|
||||
|
||||
# We only need the explicit sse2 switch for x86.
|
||||
# On other arches we can rely on autodetection which uses
|
||||
# compiler macros. Plus, --jit-backend= doesn't accept all
|
||||
# the modern values...
|
||||
|
||||
if use x86; then
|
||||
if use cpu_flags_x86_sse2; then
|
||||
jit_backend+=x86
|
||||
else
|
||||
jit_backend+=x86-without-sse2
|
||||
fi
|
||||
else
|
||||
jit_backend+=auto
|
||||
fi
|
||||
fi
|
||||
|
||||
local args=(
|
||||
--no-shared
|
||||
$(usex jit -Ojit -O2)
|
||||
|
||||
${jit_backend}
|
||||
|
||||
pypy/goal/targetpypystandalone
|
||||
)
|
||||
|
||||
# Avoid linking against libraries disabled by use flags
|
||||
local opts=(
|
||||
bzip2:bz2
|
||||
ncurses:_minimal_curses
|
||||
)
|
||||
|
||||
local opt
|
||||
for opt in "${opts[@]}"; do
|
||||
local flag=${opt%:*}
|
||||
local mod=${opt#*:}
|
||||
|
||||
args+=(
|
||||
$(usex ${flag} --withmod --withoutmod)-${mod}
|
||||
)
|
||||
done
|
||||
|
||||
local interp=( "${EPYTHON}" )
|
||||
if use low-memory; then
|
||||
interp=( env PYPY_GC_MAX_DELTA=200MB
|
||||
"${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 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"
|
||||
"${@}" || die "translation failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -C "${T}"/usession*-0/testing_1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dest=/usr/lib/pypy3.7
|
||||
exeinto "${dest}"
|
||||
newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PYPY_PV}
|
||||
insinto "${dest}"/include/${PYPY_PV}
|
||||
doins include/pypy_*
|
||||
pax-mark m "${ED}${dest}/pypy3-c-${PYPY_PV}"
|
||||
}
|
||||
@@ -1,156 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
# pypy3 needs to be built using python 2
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit check-reqs pax-utils python-any-r1 toolchain-funcs
|
||||
|
||||
MY_P=pypy3.6-v${PV/_/}
|
||||
DESCRIPTION="PyPy3 executable (build from source)"
|
||||
HOMEPAGE="https://pypy.org/"
|
||||
SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
|
||||
S="${WORKDIR}/${MY_P}-src"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="${PV}"
|
||||
KEYWORDS=""
|
||||
IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
|
||||
|
||||
RDEPEND=">=sys-libs/zlib-1.1.3:0=
|
||||
dev-libs/libffi:0=
|
||||
virtual/libintl:0=
|
||||
dev-libs/expat:0=
|
||||
bzip2? ( app-arch/bzip2:0= )
|
||||
ncurses? ( sys-libs/ncurses:0= )
|
||||
!dev-python/pypy3-exe-bin:${PV}"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
low-memory? ( dev-python/pypy )
|
||||
!low-memory? (
|
||||
|| (
|
||||
dev-python/pypy
|
||||
dev-lang/python:2.7
|
||||
)
|
||||
)"
|
||||
|
||||
check_env() {
|
||||
if use low-memory; then
|
||||
CHECKREQS_MEMORY="1750M"
|
||||
use amd64 && CHECKREQS_MEMORY="3500M"
|
||||
else
|
||||
CHECKREQS_MEMORY="3G"
|
||||
use amd64 && CHECKREQS_MEMORY="6G"
|
||||
fi
|
||||
|
||||
check-reqs_pkg_pretend
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && check_env
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
check_env
|
||||
|
||||
# unset to allow forcing pypy below :)
|
||||
use low-memory && EPYTHON=
|
||||
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."
|
||||
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
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC
|
||||
|
||||
local jit_backend
|
||||
if use jit; then
|
||||
jit_backend='--jit-backend='
|
||||
|
||||
# We only need the explicit sse2 switch for x86.
|
||||
# On other arches we can rely on autodetection which uses
|
||||
# compiler macros. Plus, --jit-backend= doesn't accept all
|
||||
# the modern values...
|
||||
|
||||
if use x86; then
|
||||
if use cpu_flags_x86_sse2; then
|
||||
jit_backend+=x86
|
||||
else
|
||||
jit_backend+=x86-without-sse2
|
||||
fi
|
||||
else
|
||||
jit_backend+=auto
|
||||
fi
|
||||
fi
|
||||
|
||||
local args=(
|
||||
--no-shared
|
||||
$(usex jit -Ojit -O2)
|
||||
|
||||
${jit_backend}
|
||||
|
||||
pypy/goal/targetpypystandalone
|
||||
)
|
||||
|
||||
# Avoid linking against libraries disabled by use flags
|
||||
local opts=(
|
||||
bzip2:bz2
|
||||
ncurses:_minimal_curses
|
||||
)
|
||||
|
||||
local opt
|
||||
for opt in "${opts[@]}"; do
|
||||
local flag=${opt%:*}
|
||||
local mod=${opt#*:}
|
||||
|
||||
args+=(
|
||||
$(usex ${flag} --withmod --withoutmod)-${mod}
|
||||
)
|
||||
done
|
||||
|
||||
local interp=( "${EPYTHON}" )
|
||||
if use low-memory; then
|
||||
interp=( env PYPY_GC_MAX_DELTA=200MB
|
||||
"${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 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"
|
||||
"${@}" || die "translation failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -C "${T}"/usession*-0/testing_1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dest=/usr/lib/pypy3.6
|
||||
exeinto "${dest}"
|
||||
newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PV}
|
||||
insinto "${dest}"/include/${PV}
|
||||
doins include/pypy_*
|
||||
pax-mark m "${ED}${dest}/pypy3-c-${PV}"
|
||||
}
|
||||
@@ -1,157 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
# pypy3 needs to be built using python 2
|
||||
PYTHON_COMPAT=( python2_7 )
|
||||
inherit check-reqs pax-utils python-any-r1 toolchain-funcs
|
||||
|
||||
PYPY_PV=${PV%_p37}
|
||||
MY_P=pypy3.7-v${PYPY_PV/_/}
|
||||
DESCRIPTION="PyPy3 executable (build from source)"
|
||||
HOMEPAGE="https://pypy.org/"
|
||||
SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2"
|
||||
S="${WORKDIR}/${MY_P}-src"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="${PV}"
|
||||
KEYWORDS=""
|
||||
IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
|
||||
|
||||
RDEPEND=">=sys-libs/zlib-1.1.3:0=
|
||||
dev-libs/libffi:0=
|
||||
virtual/libintl:0=
|
||||
dev-libs/expat:0=
|
||||
bzip2? ( app-arch/bzip2:0= )
|
||||
ncurses? ( sys-libs/ncurses:0= )
|
||||
!dev-python/pypy3-exe-bin:${PV}"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
low-memory? ( dev-python/pypy )
|
||||
!low-memory? (
|
||||
|| (
|
||||
dev-python/pypy
|
||||
dev-lang/python:2.7
|
||||
)
|
||||
)"
|
||||
|
||||
check_env() {
|
||||
if use low-memory; then
|
||||
CHECKREQS_MEMORY="1750M"
|
||||
use amd64 && CHECKREQS_MEMORY="3500M"
|
||||
else
|
||||
CHECKREQS_MEMORY="3G"
|
||||
use amd64 && CHECKREQS_MEMORY="6G"
|
||||
fi
|
||||
|
||||
check-reqs_pkg_pretend
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
[[ ${MERGE_TYPE} != binary ]] && check_env
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
if [[ ${MERGE_TYPE} != binary ]]; then
|
||||
check_env
|
||||
|
||||
# unset to allow forcing pypy below :)
|
||||
use low-memory && EPYTHON=
|
||||
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."
|
||||
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
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC
|
||||
|
||||
local jit_backend
|
||||
if use jit; then
|
||||
jit_backend='--jit-backend='
|
||||
|
||||
# We only need the explicit sse2 switch for x86.
|
||||
# On other arches we can rely on autodetection which uses
|
||||
# compiler macros. Plus, --jit-backend= doesn't accept all
|
||||
# the modern values...
|
||||
|
||||
if use x86; then
|
||||
if use cpu_flags_x86_sse2; then
|
||||
jit_backend+=x86
|
||||
else
|
||||
jit_backend+=x86-without-sse2
|
||||
fi
|
||||
else
|
||||
jit_backend+=auto
|
||||
fi
|
||||
fi
|
||||
|
||||
local args=(
|
||||
--no-shared
|
||||
$(usex jit -Ojit -O2)
|
||||
|
||||
${jit_backend}
|
||||
|
||||
pypy/goal/targetpypystandalone
|
||||
)
|
||||
|
||||
# Avoid linking against libraries disabled by use flags
|
||||
local opts=(
|
||||
bzip2:bz2
|
||||
ncurses:_minimal_curses
|
||||
)
|
||||
|
||||
local opt
|
||||
for opt in "${opts[@]}"; do
|
||||
local flag=${opt%:*}
|
||||
local mod=${opt#*:}
|
||||
|
||||
args+=(
|
||||
$(usex ${flag} --withmod --withoutmod)-${mod}
|
||||
)
|
||||
done
|
||||
|
||||
local interp=( "${EPYTHON}" )
|
||||
if use low-memory; then
|
||||
interp=( env PYPY_GC_MAX_DELTA=200MB
|
||||
"${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 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"
|
||||
"${@}" || die "translation failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake -C "${T}"/usession*-0/testing_1
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dest=/usr/lib/pypy3.7
|
||||
exeinto "${dest}"
|
||||
newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PYPY_PV}
|
||||
insinto "${dest}"/include/${PYPY_PV}
|
||||
doins include/pypy_*
|
||||
pax-mark m "${ED}${dest}/pypy3-c-${PYPY_PV}"
|
||||
}
|
||||
Reference in New Issue
Block a user