* [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3-exe/, dev-python/pypy3-exe/files/
@ 2020-02-26 12:12 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2020-02-26 12:12 UTC (permalink / raw
To: gentoo-commits
commit: a228f0e10efcfef0855e43f10539910db08b2f8f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 26 12:12:20 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Feb 26 12:12:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a228f0e1
dev-python/pypy3-exe: Fix GCC 10 / -fno-common
Closes: https://bugs.gentoo.org/706760
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/pypy3-exe-7.3.0-gcc10-fno-common.patch | 25 ++++++++++++++++++++++
dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild | 5 +++++
2 files changed, 30 insertions(+)
diff --git a/dev-python/pypy3-exe/files/pypy3-exe-7.3.0-gcc10-fno-common.patch b/dev-python/pypy3-exe/files/pypy3-exe-7.3.0-gcc10-fno-common.patch
new file mode 100644
index 00000000000..b072ee4c1e6
--- /dev/null
+++ b/dev-python/pypy3-exe/files/pypy3-exe-7.3.0-gcc10-fno-common.patch
@@ -0,0 +1,25 @@
+From 455e1f635110df4bdc2981a3a0abf02e3d4d21b2 Mon Sep 17 00:00:00 2001
+From: Matti Picus <matti.picus@gmail.com>
+Date: Wed, 26 Feb 2020 13:06:29 +0200
+Subject: [PATCH] issue 3163: the constant is defined both in vmprof_common.h and vmprof_common.c
+
+---
+ rpython/rlib/rvmprof/src/shared/vmprof_common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rpython/rlib/rvmprof/src/shared/vmprof_common.h b/rpython/rlib/rvmprof/src/shared/vmprof_common.h
+index b52ee5f..1b2278b 100644
+--- a/rpython/rlib/rvmprof/src/shared/vmprof_common.h
++++ b/rpython/rlib/rvmprof/src/shared/vmprof_common.h
+@@ -89,7 +89,7 @@ int opened_profile(const char *interp_name, int memory, int proflines, int nativ
+ result is NULL. */
+ #if PY_MAJOR_VERSION >= 3 && !defined(_Py_atomic_load_relaxed)
+ /* this was abruptly un-defined in 3.5.1 */
+-void *volatile _PyThreadState_Current;
++extern void *volatile _PyThreadState_Current;
+ /* XXX simple volatile access is assumed atomic */
+ # define _Py_atomic_load_relaxed(pp) (*(pp))
+ #endif
+--
+libgit2 0.26.0
+
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 3555bbb629d..16932248fb9 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
@@ -38,6 +38,11 @@ BDEPEND="
)
)"
+PATCHES=(
+ # https://bugs.gentoo.org/706760
+ "${FILESDIR}"/${PN}-7.3.0-gcc10-fno-common.patch
+)
+
check_env() {
if use low-memory; then
CHECKREQS_MEMORY="1750M"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3-exe/, dev-python/pypy3-exe/files/
@ 2020-09-17 16:56 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2020-09-17 16:56 UTC (permalink / raw
To: gentoo-commits
commit: 8940c2a7c85df010d851ac263ae3de9bbaf128d8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 14:02:59 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 16:56:17 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8940c2a7
dev-python/pypy3-exe: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pypy3-exe/Manifest | 3 -
.../files/pypy3-exe-7.3.0-gcc10-fno-common.patch | 25 ----
dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild | 156 ---------------------
.../pypy3-exe/pypy3-exe-7.3.2_rc1-r100.ebuild | 151 --------------------
dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1.ebuild | 151 --------------------
5 files changed, 486 deletions(-)
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index 45dd21d0c51..39001d40e36 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,6 +1,3 @@
-DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d SHA512 313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
-DIST pypy3.6-v7.3.2rc1-src.tar.bz2 22730858 BLAKE2B 41a0702d0077c0f546998b858bc8b76226fe8903f4819497aa284231edcb32bc8b047b0a2a35bacfb18ea11fb85de98b95998276c22a3f0dc716b16871b35a3a SHA512 1a6f93f7e767b0db5c40c1e06cadd781c6ddfb02ec86aa61a37f649fe1aa5cd71f7857052e5b48092e3bf8b5cbef6d6401097bf4c4e80c62f7dbdffcd20b70c0
DIST pypy3.6-v7.3.2rc2-src.tar.bz2 22750248 BLAKE2B 6a8a3c4306cb5c796ee89f3d9ece61f5d669515ae9edf4961f43c7779123554cda0f3b433f8264d3d08e531ef5fe660b494135321a11f441ae1de97ce0abb332 SHA512 a89184314d04bad646cf2e2151e2d5f27ca23a68f25e22b5c2e4f07745671e70c71d869be1c61248ee839632f7151b597fe79eb5af814967a1ae97f2c2cdb8ee
-DIST pypy3.7-v7.3.2rc1-src.tar.bz2 24805791 BLAKE2B 7b16ba9f0b33d572facdf009701712fe1b2c1eb5a4187c3a9197973ef4da140c7704b3409c7c336e1027f89df340fcefc9e52c6ccac75b251aa79d67c98e49c4 SHA512 d2a5c02a541c0ae79cf8c8e1a38299351f9dd81d1a17724d9fe346d8eb4311e2566a319cf1b8a90d393bffdc11657f6fa2f6475441634e57701b00e74899baa0
DIST pypy3.7-v7.3.2rc2-src.tar.bz2 25066853 BLAKE2B 286ec0909d4b9ba9039cd9ca234a90832e99369f5e7e36a486d219661631efac186e02146dd5bc5a51521fcfdd0047c3fa5a6dbffd20cebe8ff7c209d02fec53 SHA512 c8e5dc5ded2989aa3a6b635e040c23bb8e2812101ce22a104f251e0abaa3320b61f2f611ece58d6b8a8ae9f1cbc8ca22c920f3491dd5653bcb0e05264fd54a4f
diff --git a/dev-python/pypy3-exe/files/pypy3-exe-7.3.0-gcc10-fno-common.patch b/dev-python/pypy3-exe/files/pypy3-exe-7.3.0-gcc10-fno-common.patch
deleted file mode 100644
index b072ee4c1e6..00000000000
--- a/dev-python/pypy3-exe/files/pypy3-exe-7.3.0-gcc10-fno-common.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 455e1f635110df4bdc2981a3a0abf02e3d4d21b2 Mon Sep 17 00:00:00 2001
-From: Matti Picus <matti.picus@gmail.com>
-Date: Wed, 26 Feb 2020 13:06:29 +0200
-Subject: [PATCH] issue 3163: the constant is defined both in vmprof_common.h and vmprof_common.c
-
----
- rpython/rlib/rvmprof/src/shared/vmprof_common.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rpython/rlib/rvmprof/src/shared/vmprof_common.h b/rpython/rlib/rvmprof/src/shared/vmprof_common.h
-index b52ee5f..1b2278b 100644
---- a/rpython/rlib/rvmprof/src/shared/vmprof_common.h
-+++ b/rpython/rlib/rvmprof/src/shared/vmprof_common.h
-@@ -89,7 +89,7 @@ int opened_profile(const char *interp_name, int memory, int proflines, int nativ
- result is NULL. */
- #if PY_MAJOR_VERSION >= 3 && !defined(_Py_atomic_load_relaxed)
- /* this was abruptly un-defined in 3.5.1 */
--void *volatile _PyThreadState_Current;
-+extern void *volatile _PyThreadState_Current;
- /* XXX simple volatile access is assumed atomic */
- # define _Py_atomic_load_relaxed(pp) (*(pp))
- #endif
---
-libgit2 0.26.0
-
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
deleted file mode 100644
index edc7a19739c..00000000000
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
+++ /dev/null
@@ -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://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(+)]
- )
- )
- )"
-
-PATCHES=(
- # https://bugs.gentoo.org/706760
- "${FILESDIR}"/${PN}-7.3.0-gcc10-fno-common.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
-
- # 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}"
-}
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1-r100.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1-r100.ebuild
deleted file mode 100644
index df9d87c9239..00000000000
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1-r100.ebuild
+++ /dev/null
@@ -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.7-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}-py37"
-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.7
- 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}"
-}
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1.ebuild
deleted file mode 100644
index 24b904343e1..00000000000
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc1.ebuild
+++ /dev/null
@@ -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}"
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3-exe/, dev-python/pypy3-exe/files/
@ 2020-10-04 21:15 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2020-10-04 21:15 UTC (permalink / raw
To: gentoo-commits
commit: f0e786f0096b75d886fca041c479e936fb27e0b9
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 4 19:40:32 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 4 21:14:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0e786f0
dev-python/pypy3-exe: Backport sethostname() fix
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/pypy3-7.3.2-sethostname-bytes.patch | 61 ++++++++++++++++++++++
...-exe-7.3.2.ebuild => pypy3-exe-7.3.2-r1.ebuild} | 4 ++
....2_p37.ebuild => pypy3-exe-7.3.2_p37-r1.ebuild} | 4 ++
3 files changed, 69 insertions(+)
diff --git a/dev-python/pypy3-exe/files/pypy3-7.3.2-sethostname-bytes.patch b/dev-python/pypy3-exe/files/pypy3-7.3.2-sethostname-bytes.patch
new file mode 100644
index 00000000000..68025600b1f
--- /dev/null
+++ b/dev-python/pypy3-exe/files/pypy3-7.3.2-sethostname-bytes.patch
@@ -0,0 +1,61 @@
+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
+
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild
similarity index 98%
rename from dev-python/pypy3-exe/pypy3-exe-7.3.2.ebuild
rename to dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild
index a8648c1e6ea..73313264113 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.2.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild
@@ -35,6 +35,10 @@ BDEPEND="
)
)"
+PATCHES=(
+ "${FILESDIR}"/pypy3-7.3.2-sethostname-bytes.patch
+)
+
check_env() {
if use low-memory; then
CHECKREQS_MEMORY="1750M"
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild
similarity index 98%
rename from dev-python/pypy3-exe/pypy3-exe-7.3.2_p37.ebuild
rename to dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild
index 5992fb3e87e..592f395defc 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild
@@ -36,6 +36,10 @@ BDEPEND="
)
)"
+PATCHES=(
+ "${FILESDIR}"/pypy3-7.3.2-sethostname-bytes.patch
+)
+
check_env() {
if use low-memory; then
CHECKREQS_MEMORY="1750M"
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3-exe/, dev-python/pypy3-exe/files/
@ 2020-10-05 1:15 Georgy Yakovlev
0 siblings, 0 replies; 5+ messages in thread
From: Georgy Yakovlev @ 2020-10-05 1:15 UTC (permalink / raw
To: gentoo-commits
commit: b7f0b35fe999748b088df5dd168e8b8fad7b2ff2
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 5 00:37:29 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Oct 5 01:11:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7f0b35f
dev-python/pypy3-exe: backport ppc64 patch to 3.7.2
Patches already upstream, fixes segfault on ppc64
https://foss.heptapod.net/pypy/pypy/-/issues/3309
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
.../files/pypy3-7.3.2-ppc64-segfault.patch | 64 ++++++++++++++++++++++
dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild | 1 +
dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild | 1 +
3 files changed, 66 insertions(+)
diff --git a/dev-python/pypy3-exe/files/pypy3-7.3.2-ppc64-segfault.patch b/dev-python/pypy3-exe/files/pypy3-7.3.2-ppc64-segfault.patch
new file mode 100644
index 00000000000..c143a3765cd
--- /dev/null
+++ b/dev-python/pypy3-exe/files/pypy3-7.3.2-ppc64-segfault.patch
@@ -0,0 +1,64 @@
+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
+
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild
index 73313264113..26077ca69aa 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild
@@ -37,6 +37,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/pypy3-7.3.2-sethostname-bytes.patch
+ "${FILESDIR}"/pypy3-7.3.2-ppc64-segfault.patch
)
check_env() {
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild
index 592f395defc..4fe37f8704e 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild
@@ -38,6 +38,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/pypy3-7.3.2-sethostname-bytes.patch
+ "${FILESDIR}"/pypy3-7.3.2-ppc64-segfault.patch
)
check_env() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3-exe/, dev-python/pypy3-exe/files/
@ 2021-01-09 21:59 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2021-01-09 21:59 UTC (permalink / raw
To: gentoo-commits
commit: b9dde0996b0bace644d068ca08416d2bddc1bd48
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 9 21:56:52 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan 9 21:56:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9dde099
dev-python/pypy3-exe: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pypy3-exe/Manifest | 5 -
.../files/pypy3-7.3.2-ppc64-segfault.patch | 64 --------
.../files/pypy3-7.3.2-sethostname-bytes.patch | 61 --------
dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild | 151 -------------------
dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild | 161 --------------------
dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild | 162 ---------------------
dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1.ebuild | 156 --------------------
.../pypy3-exe/pypy3-exe-7.3.3_rc1_p37.ebuild | 157 --------------------
8 files changed, 917 deletions(-)
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index 06254507392..05cd65eecdc 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -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
diff --git a/dev-python/pypy3-exe/files/pypy3-7.3.2-ppc64-segfault.patch b/dev-python/pypy3-exe/files/pypy3-7.3.2-ppc64-segfault.patch
deleted file mode 100644
index c143a3765cd..00000000000
--- a/dev-python/pypy3-exe/files/pypy3-7.3.2-ppc64-segfault.patch
+++ /dev/null
@@ -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
-
diff --git a/dev-python/pypy3-exe/files/pypy3-7.3.2-sethostname-bytes.patch b/dev-python/pypy3-exe/files/pypy3-7.3.2-sethostname-bytes.patch
deleted file mode 100644
index 68025600b1f..00000000000
--- a/dev-python/pypy3-exe/files/pypy3-7.3.2-sethostname-bytes.patch
+++ /dev/null
@@ -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
-
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild
deleted file mode 100644
index 2d660d05c50..00000000000
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild
+++ /dev/null
@@ -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}"
-}
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild
deleted file mode 100644
index 26077ca69aa..00000000000
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.2-r1.ebuild
+++ /dev/null
@@ -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}"
-}
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild
deleted file mode 100644
index 4fe37f8704e..00000000000
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37-r1.ebuild
+++ /dev/null
@@ -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}"
-}
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1.ebuild
deleted file mode 100644
index 8a08b429432..00000000000
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1.ebuild
+++ /dev/null
@@ -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}"
-}
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1_p37.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1_p37.ebuild
deleted file mode 100644
index ab01a080545..00000000000
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.3_rc1_p37.ebuild
+++ /dev/null
@@ -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}"
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-01-09 21:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-17 16:56 [gentoo-commits] repo/gentoo:master commit in: dev-python/pypy3-exe/, dev-python/pypy3-exe/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2021-01-09 21:59 Michał Górny
2020-10-05 1:15 Georgy Yakovlev
2020-10-04 21:15 Michał Górny
2020-02-26 12:12 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox