idella4 15/03/22 08:56:03 Modified: metadata.xml ChangeLog Added: pypy-2.5.0.ebuild Log: bump; add missed dep for tests, update patches for shared-lib, all_distutils (renamed 2.5.0_all_distutils_cxx.patch) (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)
Revision Changes Path 1.12 dev-python/pypy/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/metadata.xml?rev=1.12&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/metadata.xml?rev=1.12&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/metadata.xml?r1=1.11&r2=1.12 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/metadata.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- metadata.xml 17 Dec 2014 13:16:25 -0000 1.11 +++ metadata.xml 22 Mar 2015 08:56:03 -0000 1.12 @@ -7,7 +7,10 @@ <name>Alice Ferrazzi</name> </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="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.84 dev-python/pypy/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?rev=1.84&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?rev=1.84&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/ChangeLog?r1=1.83&r2=1.84 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- ChangeLog 28 Jan 2015 19:47:38 -0000 1.83 +++ ChangeLog 22 Mar 2015 08:56:03 -0000 1.84 @@ -1,6 +1,13 @@ # ChangeLog for dev-python/pypy # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.83 2015/01/28 19:47:38 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.84 2015/03/22 08:56:03 idella4 Exp $ + +*pypy-2.5.0 (22 Mar 2015) + + 22 Mar 2015; Ian Delaney <[email protected]> +files/2.5.0-shared-lib.patch, + +files/2.5.0_all_distutils_cxx.patch, +pypy-2.5.0.ebuild, metadata.xml: + bump; add missed dep for tests, update patches for shared-lib, all_distutils + (renamed 2.5.0_all_distutils_cxx.patch) 28 Jan 2015; Michał Górny <[email protected]> pypy-2.3.1-r2.ebuild, pypy-2.4.0.ebuild: 1.1 dev-python/pypy/pypy-2.5.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.5.0.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pypy/pypy-2.5.0.ebuild?rev=1.1&content-type=text/plain Index: pypy-2.5.0.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.5.0.ebuild,v 1.1 2015/03/22 08:56:03 idella4 Exp $ EAPI=5 PYTHON_COMPAT=( python2_7 pypy ) inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator DESCRIPTION="A fast, compliant alternative implementation of the Python language" HOMEPAGE="http://pypy.org/"; SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2"; LICENSE="MIT" SLOT="0/$(get_version_component_range 1-2 ${PV})" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="bzip2 doc gdbm +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2 test tk" RDEPEND=">=sys-libs/zlib-1.1.3:0= virtual/libffi:0= virtual/libintl:0= dev-libs/expat:0= dev-libs/openssl:0= bzip2? ( app-arch/bzip2:0= ) gdbm? ( sys-libs/gdbm:0= ) ncurses? ( sys-libs/ncurses:5= ) sqlite? ( dev-db/sqlite:3= ) tk? ( dev-lang/tk:0= dev-tcltk/tix:0= ) !dev-python/pypy-bin:0" DEPEND="${RDEPEND} doc? ( dev-python/sphinx ) ${PYTHON_DEPS} test? ( dev-python/pytest )" PDEPEND="app-admin/python-updater" S="${WORKDIR}/${P}-src" pkg_pretend() { if use low-memory; then if ! python_is_installed pypy; 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() { pkg_pretend if python_is_installed pypy; then if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then einfo "Using already-installed PyPy to perform the translation." local EPYTHON=pypy 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 python-any-r1_pkg_setup } src_prepare() { epatch "${FILESDIR}/1.9-scripts-location.patch" \ "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \ "${FILESDIR}"/${PV}-shared-lib.patch # 517002 pushd lib-python/2.7 > /dev/null || die epatch "${FILESDIR}"/${PV}_all_distutils_cxx.patch popd > /dev/null || die epatch_user } src_compile() { 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=( --shared $(usex jit -Ojit -O2) $(usex shadowstack --gcrootfinder=shadowstack '') $(usex sandbox --sandbox '') ${jit_backend} --make-jobs=$(makeopts_jobs) 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=( "${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" use doc && emake -C pypy/doc/ html pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" } src_test() { # (unset) local -x PYTHONDONTWRITEBYTECODE ./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die } src_install() { einfo "Installing PyPy ..." insinto "/usr/$(get_libdir)/pypy" doins -r include lib_pypy lib-python pypy-c libpypy-c.so fperms a+x ${INSDESTTREE}/pypy-c ${INSDESTTREE}/libpypy-c.so pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" "${ED%/}${INSDESTTREE}/libpypy-c.so" dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy dodoc README.rst if ! use gdbm; then rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \ "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_gdbm.py || die fi if ! use sqlite; then rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/sqlite3 \ "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \ "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_sqlite.py || die fi if ! use tk; then rm -r "${ED%/}${INSDESTTREE}"/lib-python/*2.7/{idlelib,lib-tk} \ "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \ "${ED%/}${INSDESTTREE}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die fi # Install docs use doc && dohtml -r pypy/doc/_build/html/ einfo "Generating caches and byte-compiling ..." python_export pypy EPYTHON PYTHON PYTHON_SITEDIR local PYTHON=${ED%/}${INSDESTTREE}/pypy-c local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}" echo "EPYTHON='${EPYTHON}'" > epython.py python_domodule epython.py # Generate Grammar and PatternGrammar pickles. "${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ || die "Generation of Grammar and PatternGrammar pickles failed" # Generate cffi cache # Please keep in sync with pypy/tool/release/package.py! "${PYTHON}" -c "import _curses" || die "Failed to import _curses (cffi)" "${PYTHON}" -c "import syslog" || die "Failed to import syslog (cffi)" if use gdbm; then "${PYTHON}" -c "import gdbm" || die "Failed to import gdbm (cffi)" fi if use sqlite; then "${PYTHON}" -c "import _sqlite3" || die "Failed to import _sqlite3 (cffi)" fi if use tk; then "${PYTHON}" -c "import _tkinter" || die "Failed to import _tkinter (cffi)" fi # Cleanup temporary objects find "${ED%/}${INSDESTTREE}" -name "_cffi_*.[co]" -delete || die find "${ED%/}${INSDESTTREE}" -type d -empty -delete || die # compile the installed modules python_optimize "${ED%/}${INSDESTTREE}" }
