commit: 6bf196ac851d5427e020ceb9b79cbb40ea0ecba4 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Feb 6 22:42:07 2016 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Feb 6 22:45:07 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf196ac
dev-python/pypy3: Apply fix for ncurses-6, #564454 dev-python/pypy3/files/2.4.0-ncurses6.patch | 34 ++++ dev-python/pypy3/pypy3-2.4.0-r1.ebuild | 232 ++++++++++++++++++++++++++++ 2 files changed, 266 insertions(+) diff --git a/dev-python/pypy3/files/2.4.0-ncurses6.patch b/dev-python/pypy3/files/2.4.0-ncurses6.patch new file mode 100644 index 0000000..63a450f --- /dev/null +++ b/dev-python/pypy3/files/2.4.0-ncurses6.patch @@ -0,0 +1,34 @@ +Patch by Vadim A. Misbakh-Soloviov (mva) +https://bugs.gentoo.org/show_bug.cgi?id=564454 + +--- lib_pypy/_curses.py.old 2016-01-18 19:13:00.241886442 +0000 ++++ lib_pypy/_curses.py 2016-01-18 19:26:01.061885605 +0000 +@@ -1,6 +1,7 @@ + """Reimplementation of the standard extension module '_curses' using cffi.""" + + import sys ++import platform + if sys.platform == 'win32': + #This module does not exist in windows + raise ImportError('No module named _curses') +@@ -10,12 +11,18 @@ + + ffi = FFI() + ++# Monkeypatch to make it build against ncurses-6. ++# Inspired by https://goo.gl/xvjQcd ++_type = "uint32_t" ++if platform.machine() == "x86_64": ++ _type = "unsigned" ++ + ffi.cdef(""" + typedef ... WINDOW; + typedef ... SCREEN; +-typedef unsigned long mmask_t; ++typedef """+_type+""" mmask_t; + typedef unsigned char bool; +-typedef unsigned long chtype; ++typedef """+_type+""" chtype; + typedef chtype attr_t; + + typedef struct diff --git a/dev-python/pypy3/pypy3-2.4.0-r1.ebuild b/dev-python/pypy3/pypy3-2.4.0-r1.ebuild new file mode 100644 index 0000000..e555175 --- /dev/null +++ b/dev-python/pypy3/pypy3-2.4.0-r1.ebuild @@ -0,0 +1,232 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +# pypy3 needs to be built using python 2 +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 Python 3" +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 gdbm +jit libressl low-memory ncurses sandbox +shadowstack sqlite cpu_flags_x86_sse2 tk" + +RDEPEND=">=sys-libs/zlib-1.1.3:0= + virtual/libffi:0= + virtual/libintl:0= + dev-libs/expat:0= + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + bzip2? ( app-arch/bzip2:0= ) + gdbm? ( sys-libs/gdbm:0= ) + ncurses? ( >=sys-libs/ncurses-6.0:0= ) + sqlite? ( dev-db/sqlite:3= ) + tk? ( + dev-lang/tk:0= + dev-tcltk/tix:0= + ) + !dev-python/pypy3-bin:0" +DEPEND="${RDEPEND} + low-memory? ( virtual/pypy:0 ) + !low-memory? ( ${PYTHON_DEPS} )" +# doc? ( dev-python/sphinx ) +PDEPEND="app-admin/python-updater" + +S="${WORKDIR}/${P}-src" + +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + if use low-memory; then + CHECKREQS_MEMORY="1750M" + use amd64 && CHECKREQS_MEMORY="3500M" + else + CHECKREQS_MEMORY="3G" + use amd64 && CHECKREQS_MEMORY="6G" + fi + fi + + check-reqs_pkg_pretend +} + +pkg_setup() { + if [[ ${MERGE_TYPE} != binary ]]; then + pkg_pretend + + # unset to allow forcing pypy below :) + use low-memory && local EPYTHON= + if python_is_installed pypy && [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]]; then + einfo "Using PyPy to perform the translation." + local 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 "virtual/pypy and ensure that EPYTHON variable is unset." + fi + + python-any-r1_pkg_setup + fi +} + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-gcc-4.9.patch \ + "${FILESDIR}/1.9-scripts-location.patch" \ + "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \ + "${FILESDIR}"/2.3.1-shared-lib.patch # 517002 + epatch "${FILESDIR}/2.4.0-ncurses6.patch" + epatch "${FILESDIR}"/${PN}-2.4.0-libressl.patch + + 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" + + # Exception occurred: + # File "/tmp/1/pypy3-2.4.0-src/pypy/config/makerestdoc.py", line 199, in config_role + # assert txt.check() + # AssertionError + #use doc && emake -C pypy/doc/ html + pax-mark m "${ED%/}${INSDESTTREE}/pypy-c" +} + +src_test() { + # (unset) + local -x PYTHONDONTWRITEBYTECODE + + # Test runner requires Python 2 too. However, it spawns PyPy3 + # internally so that we end up testing the correct interpreter. + "${PYTHON}" ./pypy/test_all.py --pypy=./pypy-c lib-python || die +} + +src_install() { + einfo "Installing PyPy ..." + insinto "/usr/$(get_libdir)/pypy3" + 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)/pypy3/pypy-c /usr/bin/pypy3 + dodoc README.rst + + if ! use gdbm; then + rm -r "${ED%/}${INSDESTTREE}"/lib_pypy/gdbm.py \ + "${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_gdbm.py || die + fi + if ! use sqlite; then + rm -r "${ED%/}${INSDESTTREE}"/lib-python/*3/sqlite3 \ + "${ED%/}${INSDESTTREE}"/lib_pypy/_sqlite3.py \ + "${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_sqlite.py || die + fi + if ! use tk; then + rm -r "${ED%/}${INSDESTTREE}"/lib-python/*3/{idlelib,tkinter} \ + "${ED%/}${INSDESTTREE}"/lib_pypy/_tkinter \ + "${ED%/}${INSDESTTREE}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die + fi + + # Install docs + #use doc && dohtml -r pypy/doc/_build/html/ + + einfo "Generating caches and byte-compiling ..." + + local -x PYTHON=${ED%/}${INSDESTTREE}/pypy-c + local -x LD_LIBRARY_PATH="${ED%/}${INSDESTTREE}" + # we can't use eclass function since PyPy is dumb and always gives + # paths relative to the interpreter + local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy3/site-packages + python_export pypy3 EPYTHON + + echo "EPYTHON='${EPYTHON}'" > epython.py || die + 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 syslog" || die "Failed to import syslog (cffi)" + if use gdbm; then + "${PYTHON}" -c "import _gdbm" || die "Failed to import gdbm (cffi)" + fi + if use ncurses; then + "${PYTHON}" -c "import _curses" || die "Failed to import _curses (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}" +}
