Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/mgorny:master commit in: dev-binpkg/pypy/
Date: Mon, 06 Jun 2016 11:36:57
Message-Id: 1465212995.e49a378b7f9858486f11805646d450aa22730f7e.mgorny@gentoo
1 commit: e49a378b7f9858486f11805646d450aa22730f7e
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 6 11:36:35 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 6 11:36:35 2016 +0000
6 URL: https://gitweb.gentoo.org/dev/mgorny.git/commit/?id=e49a378b
7
8 dev-binpkg/pypy: Bump to 5.1.1
9
10 dev-binpkg/pypy/Manifest | 1 +
11 dev-binpkg/pypy/pypy-5.1.1.ebuild | 191 ++++++++++++++++++++++++++++++++++++++
12 2 files changed, 192 insertions(+)
13
14 diff --git a/dev-binpkg/pypy/Manifest b/dev-binpkg/pypy/Manifest
15 index c920f8c..15d699e 100644
16 --- a/dev-binpkg/pypy/Manifest
17 +++ b/dev-binpkg/pypy/Manifest
18 @@ -2,3 +2,4 @@ DIST pypy-2.6.0-src.tar.bz2 16858400 SHA256 9bf353f22d25e97a85a6d3766619966055ed
19 DIST pypy-4.0.0-src.tar.bz2 17244624 SHA256 acff480e44ce92acd057f2e786775af36dc3c2cd12e9efc60a1ac6a562ad7b4d SHA512 2bbdc2536a32b0aa28f7b12ec3d879ed28afe984fad38635bc3e1d950a9fe198cfbaf9b554f0fa245e7fd512ec7a76297f05a1d3e17f73fb49e8506561190f5b WHIRLPOOL e94bdf5e8ea2cbab8e25d37bb7cb36b9bae773ec051d603cfce784e0fd8e591ed16e6896f49d14d9ae094c5f613a0ba871380c8adc2a1cf0023157e3e2a51f52
20 DIST pypy-4.0.1-src.tar.bz2 17172844 SHA256 29f5aa6ba17b34fd980e85172dfeb4086fdc373ad392b1feff2677d2d8aea23c SHA512 66358cc3fe9ccb402b717379c48731aca8f9f85a1a754a54e3a060113398955b87a3f3048ba731a93be4b49c0f5c7e3bac49dc4523263e1bf4f4b5149d5db5c4 WHIRLPOOL 656a6c60aeb26cb6355db121a92bafcf2b744a7f09dccf21b4a16052c0117d239891ccf6762fcb4fee7f913862263c589becd5984498edc4a8b6d55784957994
21 DIST pypy-5.0.0-src.tar.bz2 17223494 SHA256 89027b1b33553b53ff7733dc4838f0a76af23552c0d915d9f6de5875b8d7d4ab SHA512 2af686cdad13a1083114a03a7361f58c4dd482e3a83a63b43f8d40922a11120383f91deb6f1607510c4bbd22fd8c59dcf1b58406c2e5cf5548a48542e1b20f89 WHIRLPOOL 61c9ada98e710019832cb6468e68c8b17e429e48f2ea0480371b2f04521bc77ab774a21dba2280bb40b97e528ad391a83d139bb839461899f9dc214d60683716
22 +DIST pypy-5.1.1-src.tar.bz2 17328934 SHA256 ca3d943d7fbd78bb957ee9e5833ada4bb8506ac99a41b7628790e286a65ed2be SHA512 2d81b62747ac02980c275fe24fff689e93b4b352e6279c55ca570fd76b8477a55f819e81fab4c6ffdb6991f29536c606d75e238d5bbe04518357509020f23ca9 WHIRLPOOL 17f78c8c7df9e07af3fce15392061652284606fbd872706888094ec01d222957c8ee43d2667369377ceb1a9720692d130e4a540bcaff269b4c7d8896b14d708d
23
24 diff --git a/dev-binpkg/pypy/pypy-5.1.1.ebuild b/dev-binpkg/pypy/pypy-5.1.1.ebuild
25 new file mode 100644
26 index 0000000..cff3eb2
27 --- /dev/null
28 +++ b/dev-binpkg/pypy/pypy-5.1.1.ebuild
29 @@ -0,0 +1,191 @@
30 +# Copyright 1999-2016 Gentoo Foundation
31 +# Distributed under the terms of the GNU General Public License v2
32 +# $Id$
33 +
34 +EAPI=5
35 +
36 +PYTHON_COMPAT=( python2_7 pypy )
37 +inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator
38 +
39 +DESCRIPTION="A fast, compliant alternative implementation of the Python language"
40 +HOMEPAGE="http://pypy.org/"
41 +SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${P}-src.tar.bz2"
42 +
43 +LICENSE="MIT"
44 +SLOT="0/$(get_version_component_range 1-2 ${PV})"
45 +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
46 +IUSE="bzip2 +jit low-memory ncurses sandbox shadowstack sqlite cpu_flags_x86_sse2"
47 +
48 +DEPEND=">=sys-libs/zlib-1.1.3:0=
49 + virtual/libffi:0=
50 + virtual/libintl:0=
51 + dev-libs/expat:0=
52 + dev-libs/openssl:0=[-bindist]
53 + bzip2? ( app-arch/bzip2:0= )
54 + ncurses? ( sys-libs/ncurses:0= )
55 + app-arch/xz-utils
56 + ${PYTHON_DEPS}"
57 +
58 +S="${WORKDIR}/${P}-src"
59 +
60 +pkg_pretend() {
61 + if use low-memory; then
62 + if ! python_is_installed pypy; then
63 + eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
64 + eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
65 + eerror
66 + eerror " $ emerge -1v dev-python/pypy-bin"
67 + eerror
68 + eerror "before attempting to build dev-python/pypy[low-memory]."
69 + die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory"
70 + fi
71 +
72 + CHECKREQS_MEMORY="1750M"
73 + use amd64 && CHECKREQS_MEMORY="3500M"
74 + else
75 + CHECKREQS_MEMORY="3G"
76 + use amd64 && CHECKREQS_MEMORY="6G"
77 + fi
78 +
79 + check-reqs_pkg_pretend
80 +
81 + [[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
82 +}
83 +
84 +pkg_setup() {
85 + pkg_pretend
86 +
87 + if python_is_installed pypy; then
88 + if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
89 + einfo "Using already-installed PyPy to perform the translation."
90 + local EPYTHON=pypy
91 + else
92 + einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
93 + einfo "recommends using PyPy for that. If you wish to do so, please unset"
94 + einfo "the EPYTHON variable."
95 + fi
96 + fi
97 +
98 + python-any-r1_pkg_setup
99 +
100 + local cpu
101 + if use amd64; then
102 + # common denominator between Intel & AMD
103 + cpu='x86-64'
104 + elif use x86; then
105 + if use cpu_flags_x86_sse2; then
106 + # lowest with SSE2
107 + cpu='pentium-m'
108 + else
109 + # lowest with SSE, compat. with athlon-xp
110 + # TODO: do we want to support something older?
111 + cpu='pentium3'
112 + fi
113 + else
114 + die "Unsupported arch ${ARCH}"
115 + fi
116 +
117 + export CFLAGS="-march=${cpu} -mtune=generic -O2 -pipe"
118 + export CXXFLAGS=${CFLAGS}
119 +
120 + elog "CFLAGS: ${CFLAGS}"
121 +}
122 +
123 +src_prepare() {
124 + epatch "${FILESDIR}"/2.5.0-shared-lib.patch # 517002
125 +
126 + epatch_user
127 +}
128 +
129 +src_compile() {
130 + tc-export CC
131 +
132 + local jit_backend
133 + if use jit; then
134 + jit_backend='--jit-backend='
135 +
136 + # We only need the explicit sse2 switch for x86.
137 + # On other arches we can rely on autodetection which uses
138 + # compiler macros. Plus, --jit-backend= doesn't accept all
139 + # the modern values...
140 +
141 + if use x86; then
142 + if use cpu_flags_x86_sse2; then
143 + jit_backend+=x86
144 + else
145 + jit_backend+=x86-without-sse2
146 + fi
147 + else
148 + jit_backend+=auto
149 + fi
150 + fi
151 +
152 + local args=(
153 + --shared
154 + $(usex jit -Ojit -O2)
155 + $(usex shadowstack --gcrootfinder=shadowstack '')
156 + $(usex sandbox --sandbox '')
157 +
158 + ${jit_backend}
159 + --make-jobs=$(makeopts_jobs)
160 +
161 + pypy/goal/targetpypystandalone
162 + )
163 +
164 + # Avoid linking against libraries disabled by use flags
165 + local opts=(
166 + bzip2:bz2
167 + ncurses:_minimal_curses
168 + )
169 +
170 + local opt
171 + for opt in "${opts[@]}"; do
172 + local flag=${opt%:*}
173 + local mod=${opt#*:}
174 +
175 + args+=(
176 + $(usex ${flag} --withmod --withoutmod)-${mod}
177 + )
178 + done
179 +
180 + local interp=( "${PYTHON}" )
181 + if use low-memory; then
182 + interp=( env PYPY_GC_MAX_DELTA=200MB
183 + "${PYTHON}" --jit loop_longevity=300 )
184 + fi
185 +
186 + set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}"
187 + echo -e "\033[1m${@}\033[0m"
188 + "${@}" || die "compile error"
189 +
190 + pax-mark m "${ED%/}${INSDESTTREE}/pypy-c"
191 +}
192 +
193 +src_install() {
194 + local flags=( bzip2 jit ncurses sandbox shadowstack )
195 + use x86 && flags+=( cpu_flags_x86_sse2 )
196 + local f suffix="-${ARCH}"
197 +
198 + for f in ${flags[@]}; do
199 + use ${f} && suffix+="+${f#cpu_flags_x86_}"
200 + done
201 +
202 + local BIN_P=pypy-bin-${PV}
203 +
204 + einfo "Zipping PyPy ..."
205 + mkdir "${BIN_P}${suffix}"{,/include} || die
206 + mv pypy-c libpypy-c.so "${BIN_P}${suffix}"/ || die
207 + mv include/pypy_* "${BIN_P}${suffix}"/include/ || die
208 + chmod +x "${BIN_P}${suffix}"/pypy-c || die
209 +
210 + tar -cf "${BIN_P}${suffix}.tar" "${BIN_P}${suffix}" || die
211 + xz -vz9e "${BIN_P}${suffix}.tar" || die
212 +}
213 +
214 +# Yup, very hacky.
215 +pkg_preinst() {
216 + # integrity check.
217 + [[ ${PYPY_BINPKG_STORE} ]] || die 'PYPY_BINPKG_STORE unset, wtf?!'
218 + mkdir -p "${ROOT%/}${PYPY_BINPKG_STORE}" || die
219 + mv "${S}"/*.tar.xz "${ROOT%/}${PYPY_BINPKG_STORE}" || die
220 +}