diff options
author | 2017-04-25 18:21:13 +0200 | |
---|---|---|
committer | 2017-04-25 18:24:11 +0200 | |
commit | 74a7e61e27369e5b1a55ea9014d5dd4e61b6a11c (patch) | |
tree | 50e84ece2ec3212ac8380b6a0a8869ecb084faac | |
parent | dev-binpkg/pypy: Disarm -flto (diff) | |
download | mgorny-74a7e61e27369e5b1a55ea9014d5dd4e61b6a11c.tar.gz mgorny-74a7e61e27369e5b1a55ea9014d5dd4e61b6a11c.tar.bz2 mgorny-74a7e61e27369e5b1a55ea9014d5dd4e61b6a11c.zip |
dev-binpkg/pypy3: Bump to 5.7.1
-rw-r--r-- | dev-binpkg/pypy3/Manifest | 1 | ||||
-rw-r--r-- | dev-binpkg/pypy3/files/2.5.0-shared-lib.patch | 4 | ||||
-rw-r--r-- | dev-binpkg/pypy3/files/5.7.1-kill-flto.patch | 27 | ||||
-rw-r--r-- | dev-binpkg/pypy3/pypy3-5.7.1.ebuild | 201 |
4 files changed, 231 insertions, 2 deletions
diff --git a/dev-binpkg/pypy3/Manifest b/dev-binpkg/pypy3/Manifest index 19492c2..b1359d3 100644 --- a/dev-binpkg/pypy3/Manifest +++ b/dev-binpkg/pypy3/Manifest @@ -1,3 +1,4 @@ DIST pypy3-2.4.0-src.tar.bz2 14693194 SHA256 d9ba207d6eecf8a0dc4414e9f4e92db1abd143e8cc6ec4a6bdcac75b29f104f3 SHA512 7e2b0c21f1833b8cd61251c2d58c6a9f99207e5d582618f0036886ff28dcb313541dce1c36bd1b57b332a36a94b13e416bb7b67110be7c8ece8283749ba712be WHIRLPOOL bd02009c828b7b491b46b260d687d268561e5372766adccbcb58e87a3f1c545f293c54e5cdd6e6b7fb95feb678677137211ee890f106140ce1bc256f8563d2cd +DIST pypy3-v5.7.1-src.tar.bz2 28811162 SHA256 40ece0145282980ac121390f13709404c0532896507d5767496381180b631bd0 SHA512 f8ead8214ad7d89fe80e24d97b13ece7f2c80b2f11446257a2eab0e3025fc7d8fec26474b0e9eb2b2e3ccd629532dd062829459361b601add12e40793bd5aa60 WHIRLPOOL 180a5cb39c9a5e3840f4940463dd9cccf44486f11a657d2ac644d1eac4561068f08905fdadc495918fb0ceaf018d4b85a3e5756ca6d99a020310b46bdb16ef87 DIST pypy3.3-v5.2.0-alpha1-src.tar.bz2 24390595 SHA256 344c2f088c82ea1274964bb0505ab80d3f9e538cc03f91aa109325ddbaa61426 SHA512 1b6bcab12a7f4dd0ac44158b8acafd64de4b9bcc277385ba4c05982381dcd577fa6ec7b2247f70d2671055f3669764b92b4447b32d51ded58c60e6ec23509595 WHIRLPOOL 9455686af04f31da52da812e4f48d773c1ce45180ba067a308a779fa8b468b5a10c446a28d7468e61278801837705e882240a2e17884bc94069e564a5706f177 DIST pypy3.3-v5.5.0-alpha-src.tar.bz2 25122033 SHA256 d5591c34d77253e9ed57d182b6f49585b95f7c09c3e121f0e8630e5a7e75ab5f SHA512 b2cf9700e45c452293297edffe08e572dffc3c567026b4b5d9165c1ba1b4d858ffc8a6754f5f28781020016c36440e5c02d07562d075b12444c9c32ea5dd2168 WHIRLPOOL 6bde174969413c55d6d077cd14e737c4f034f19935536af1bffaf3a1caa456d2bf6850760a18c274ad99089bd5ab7331d7d185f914cd6c69f708abf857d35df3 diff --git a/dev-binpkg/pypy3/files/2.5.0-shared-lib.patch b/dev-binpkg/pypy3/files/2.5.0-shared-lib.patch index ddd7473..b5c877b 100644 --- a/dev-binpkg/pypy3/files/2.5.0-shared-lib.patch +++ b/dev-binpkg/pypy3/files/2.5.0-shared-lib.patch @@ -1,6 +1,6 @@ diff -ur pypy-2.5.0-src.orig/rpython/translator/platform/posix.py pypy-2.5.0-src/rpython/translator/platform/posix.py ---- rpython/translator/platform/posix.py 2015-02-03 05:12:49.000000000 +0800 -+++ rpython/translator/platform/posix.py 2015-03-22 07:36:01.420116684 +0800 +--- a/rpython/translator/platform/posix.py 2015-02-03 05:12:49.000000000 +0800 ++++ b/rpython/translator/platform/posix.py 2015-03-22 07:36:01.420116684 +0800 @@ -183,7 +183,7 @@ 'int main(int argc, char* argv[]) ' '{ return $(PYPY_MAIN_FUNCTION)(argc, argv); }" > $@') diff --git a/dev-binpkg/pypy3/files/5.7.1-kill-flto.patch b/dev-binpkg/pypy3/files/5.7.1-kill-flto.patch new file mode 100644 index 0000000..92395bd --- /dev/null +++ b/dev-binpkg/pypy3/files/5.7.1-kill-flto.patch @@ -0,0 +1,27 @@ +From 261f9280d9736965a8626c2d6a6fadd4254b2b89 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Tue, 25 Apr 2017 17:03:46 +0200 +Subject: [PATCH] Kill -flto + +--- + rpython/translator/platform/posix.py | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/rpython/translator/platform/posix.py b/rpython/translator/platform/posix.py +index a8d4768..20a2934 100644 +--- a/rpython/translator/platform/posix.py ++++ b/rpython/translator/platform/posix.py +@@ -130,10 +130,6 @@ class BasePosix(Platform): + else: + cflags = tuple(self.cflags) + tuple(self.standalone_only) + +- # xxx check which compilers accept this option or not +- if not config or config.translation.gcrootfinder != 'asmgcc': +- cflags = ('-flto',) + cflags +- + m = GnuMakefile(path) + m.exe_name = path.join(exe_name.basename) + m.eci = eci +-- +2.12.2 + diff --git a/dev-binpkg/pypy3/pypy3-5.7.1.ebuild b/dev-binpkg/pypy3/pypy3-5.7.1.ebuild new file mode 100644 index 0000000..71c277c --- /dev/null +++ b/dev-binpkg/pypy3/pypy3-5.7.1.ebuild @@ -0,0 +1,201 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +# pypy3 needs to be built using python 2 +PYTHON_COMPAT=( python2_7 pypy ) +inherit check-reqs multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator + +MY_P=pypy3-v${PV} + +DESCRIPTION="A fast, compliant alternative implementation of the Python (3.3) language" +HOMEPAGE="http://pypy.org/" +SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2" + +LICENSE="MIT" +# XX from pypy3-XX.so module suffix +SLOT="0/55" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="bzip2 +jit libressl low-memory ncurses sandbox cpu_flags_x86_sse2" + +DEPEND=">=sys-libs/zlib-1.1.3:0= + virtual/libffi:0= + virtual/libintl:0= + dev-libs/expat:0= + !libressl? ( dev-libs/openssl:0=[-bindist] ) + libressl? ( dev-libs/libressl:0= ) + bzip2? ( app-arch/bzip2:0= ) + ncurses? ( sys-libs/ncurses:0= ) + app-arch/lzip + low-memory? ( virtual/pypy:0 ) + !low-memory? ( ${PYTHON_DEPS} )" +# doc? ( dev-python/sphinx ) + +S="${WORKDIR}/${MY_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 + + check-reqs_pkg_pretend + fi +} + +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 + + local cpu + if use amd64; then + # common denominator between Intel & AMD + cpu='x86-64' + elif use x86; then + if use cpu_flags_x86_sse2; then + # lowest with SSE2 + cpu='pentium-m' + else + # lowest with SSE, compat. with athlon-xp + # TODO: do we want to support something older? + cpu='pentium3' + fi + else + die "Unsupported arch ${ARCH}" + fi + + export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe" + export CXXFLAGS=${CFLAGS} + + elog "CFLAGS: ${CFLAGS}" + fi +} + +src_prepare() { + eapply "${FILESDIR}"/2.5.0-shared-lib.patch # 517002 + # disarm implicit -flto + eapply "${FILESDIR}"/5.7.1-kill-flto.patch + + eapply_user +} + +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=( + --shared + $(usex jit -Ojit -O2) + $(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 + + # 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 + + # copy back to make sys.prefix happy + cp -p "${T}"/usession*-0/testing_1/{pypy-c,libpypy-c.so} . || die + pax-mark m pypy-c libpypy-c.so + + #use doc && emake -C pypy/doc html +} + +src_install() { + local flags=( bzip2 jit ncurses sandbox ) + use x86 && flags+=( cpu_flags_x86_sse2 ) + local f suffix="-${ARCH}" + + for f in ${flags[@]}; do + use ${f} && suffix+="+${f#cpu_flags_x86_}" + done + + local BIN_P=pypy3-bin-${PV} + + einfo "Zipping PyPy ..." + mkdir "${BIN_P}${suffix}"{,/include} || die + mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die + mv include/pypy_* "${BIN_P}${suffix}"/include/ || die + chmod +x "${BIN_P}${suffix}"/pypy-c || die + + tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die + lzip -v9 "${BIN_P}${suffix}.tar" || die +} + +# Yup, very hacky. +pkg_preinst() { + # integrity check. + [[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!' + mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die + mv "${S}"/*.tar.lz "${ROOT%/}${PYPY_BINPKG_STORE}" || die +} |