mgorny 14/11/04 23:51:08
Modified: pypy-2.3.1-r2.ebuild pypy-2.4.0.ebuild metadata.xml
ChangeLog
Log:
Set higher memory requirements. Translate using PyPy by default. Add
USE=low-memory to translate using PyPy profiled for low memory use.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
EFB4464E!)
Revision Changes Path
1.2 dev-python/pypy/pypy-2.3.1-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.3.1-r2.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.3.1-r2.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.3.1-r2.ebuild?r1=1.1&r2=1.2
Index: pypy-2.3.1-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.3.1-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pypy-2.3.1-r2.ebuild 4 Nov 2014 15:04:44 -0000 1.1
+++ pypy-2.3.1-r2.ebuild 4 Nov 2014 23:51:08 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.3.1-r2.ebuild,v 1.1
2014/11/04 15:04:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.3.1-r2.ebuild,v 1.2
2014/11/04 23:51:08 mgorny Exp $
EAPI=5
@@ -15,7 +15,7 @@
LICENSE="MIT"
SLOT="0/$(get_version_component_range 1-2 ${PV})"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 doc gdbm +jit ncurses sandbox shadowstack sqlite sse2 tk"
+IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox shadowstack sqlite sse2
tk"
RDEPEND=">=sys-libs/zlib-1.1.3:0=
virtual/libffi:0=
@@ -39,14 +39,53 @@
S="${WORKDIR}/${P}-src"
pkg_pretend() {
- CHECKREQS_MEMORY="2G"
- use amd64 && CHECKREQS_MEMORY="4G"
+ if use low-memory; then
+ if ! has_version dev-python/pypy && ! has_version
dev-python/pypy-bin
+ then
+ eerror "USE=low-memory requires a (possibly old)
version of dev-python/pypy"
+ eerror "or dev-python/pypy-bin being installed. Please
install it using e.g.:"
+ eerror
+ eerror " $ emerge -1v dev-python/pypy-bin"
+ eerror
+ eerror "before attempting to build
dev-python/pypy[low-memory]."
+ die "dev-python/pypy-bin (or dev-python/pypy) needs to
be installed for USE=low-memory"
+ fi
+
+ CHECKREQS_MEMORY="1750M"
+ use amd64 && CHECKREQS_MEMORY="3500M"
+ else
+ CHECKREQS_MEMORY="3G"
+ use amd64 && CHECKREQS_MEMORY="6G"
+ fi
+
check-reqs_pkg_pretend
}
pkg_setup() {
+ local force_pypy
+
pkg_pretend
- python-any-r1_pkg_setup
+
+ if has_version dev-python/pypy || has_version dev-python/pypy-bin
+ then
+ if [[ ! ${EPYTHON} ]] || use low-memory; then
+ einfo "Using already-installed PyPy to perform the
translation."
+ force_pypy=1
+ else
+ einfo "Using ${EPYTHON} to perform the translation.
Please note that upstream"
+ einfo "recommends using PyPy for that. If you wish to
do so, please unset"
+ einfo "the EPYTHON variable."
+ fi
+ fi
+
+ if [[ ${force_pypy} ]]; then
+ # set manually since python_setup needs virtual/pypy
+ # and we don't force the dep
+ python_export pypy EPYTHON PYTHON
+ python_wrapper_setup
+ else
+ python-any-r1_pkg_setup
+ fi
}
src_prepare() {
@@ -112,7 +151,13 @@
)
done
- set -- "${PYTHON}" rpython/bin/rpython --batch "${args[@]}"
+ local interp=( "${PYTHON}" )
+ if use low-memory; then
+ interp=( env PYPY_GC_MAX_DELTA=200MB
+ "${PYTHON}" --jit loop_longevity=300 )
+ fi
+
+ set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}"
echo -e "\033[1m${@}\033[0m"
"${@}" || die "compile error"
1.3 dev-python/pypy/pypy-2.4.0.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild?rev=1.3&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild?rev=1.3&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild?r1=1.2&r2=1.3
Index: pypy-2.4.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pypy-2.4.0.ebuild 4 Nov 2014 15:04:44 -0000 1.2
+++ pypy-2.4.0.ebuild 4 Nov 2014 23:51:08 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild,v 1.2
2014/11/04 15:04:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild,v 1.3
2014/11/04 23:51:08 mgorny Exp $
EAPI=5
@@ -19,7 +19,7 @@
#KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
KEYWORDS=""
-IUSE="bzip2 doc gdbm +jit ncurses sandbox shadowstack sqlite sse2 tk"
+IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox shadowstack sqlite sse2
tk"
RDEPEND=">=sys-libs/zlib-1.1.3:0=
virtual/libffi:0=
@@ -43,14 +43,53 @@
S="${WORKDIR}/${P}-src"
pkg_pretend() {
- CHECKREQS_MEMORY="2G"
- use amd64 && CHECKREQS_MEMORY="4G"
+ if use low-memory; then
+ if ! has_version dev-python/pypy && ! has_version
dev-python/pypy-bin
+ then
+ eerror "USE=low-memory requires a (possibly old)
version of dev-python/pypy"
+ eerror "or dev-python/pypy-bin being installed. Please
install it using e.g.:"
+ eerror
+ eerror " $ emerge -1v dev-python/pypy-bin"
+ eerror
+ eerror "before attempting to build
dev-python/pypy[low-memory]."
+ die "dev-python/pypy-bin (or dev-python/pypy) needs to
be installed for USE=low-memory"
+ fi
+
+ CHECKREQS_MEMORY="1750M"
+ use amd64 && CHECKREQS_MEMORY="3500M"
+ else
+ CHECKREQS_MEMORY="3G"
+ use amd64 && CHECKREQS_MEMORY="6G"
+ fi
+
check-reqs_pkg_pretend
}
pkg_setup() {
+ local force_pypy
+
pkg_pretend
- python-any-r1_pkg_setup
+
+ if has_version dev-python/pypy || has_version dev-python/pypy-bin
+ then
+ if [[ ! ${EPYTHON} ]] || use low-memory; then
+ einfo "Using already-installed PyPy to perform the
translation."
+ force_pypy=1
+ else
+ einfo "Using ${EPYTHON} to perform the translation.
Please note that upstream"
+ einfo "recommends using PyPy for that. If you wish to
do so, please unset"
+ einfo "the EPYTHON variable."
+ fi
+ fi
+
+ if [[ ${force_pypy} ]]; then
+ # set manually since python_setup needs virtual/pypy
+ # and we don't force the dep
+ python_export pypy EPYTHON PYTHON
+ python_wrapper_setup
+ else
+ python-any-r1_pkg_setup
+ fi
}
src_prepare() {
@@ -116,7 +155,13 @@
)
done
- set -- "${PYTHON}" rpython/bin/rpython --batch "${args[@]}"
+ local interp=( "${PYTHON}" )
+ if use low-memory; then
+ interp=( env PYPY_GC_MAX_DELTA=200MB
+ "${PYTHON}" --jit loop_longevity=300 )
+ fi
+
+ set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}"
echo -e "\033[1m${@}\033[0m"
"${@}" || die "compile error"
1.10 dev-python/pypy/metadata.xml
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/metadata.xml?rev=1.10&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/metadata.xml?rev=1.10&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/metadata.xml?r1=1.9&r2=1.10
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/metadata.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- metadata.xml 12 Mar 2014 13:00:13 -0000 1.9
+++ metadata.xml 4 Nov 2014 23:51:08 -0000 1.10
@@ -9,6 +9,7 @@
<description>Proxy maintainer</description>
</maintainer>
<use>
+ <flag name="low-memory">Build using PyPy with the engine
configured towards low memory footprint. This makes it possible to build PyPy
using ~3.5G of RAM on amd64 and ~half of that on x86, at the cost of lengthened
build time. Please note that you will need an extra ~1G of extra RAM or swap
since the translation memory (unused at the time) is not freed when the C
compiler is spawned.</flag>
<flag name="sandbox">Enable sandboxing functionality</flag>
<flag name="shadowstack">Use a shadow stack for finding GC
roots</flag>
</use>
1.73 dev-python/pypy/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?rev=1.73&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?rev=1.73&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?r1=1.72&r2=1.73
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ChangeLog 4 Nov 2014 15:04:44 -0000 1.72
+++ ChangeLog 4 Nov 2014 23:51:08 -0000 1.73
@@ -1,6 +1,11 @@
# ChangeLog for dev-python/pypy
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.72 2014/11/04
15:04:44 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.73 2014/11/04
23:51:08 mgorny Exp $
+
+ 04 Nov 2014; Michał Górny <[email protected]> metadata.xml,
+ pypy-2.3.1-r2.ebuild, pypy-2.4.0.ebuild:
+ Set higher memory requirements. Translate using PyPy by default. Add USE=low-
+ memory to translate using PyPy profiled for low memory use.
*pypy-2.3.1-r2 (04 Nov 2014)
