1 |
commit: 57ff7768ae2d47ad2c4f8a1c4479b72b1d5ec50f |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 3 07:39:36 2016 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 3 08:19:07 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57ff7768 |
7 |
|
8 |
dev-python/pypy: Bump to 5.3.1, minor fixes |
9 |
|
10 |
dev-python/pypy/Manifest | 1 + |
11 |
dev-python/pypy/pypy-5.3.1.ebuild | 256 ++++++++++++++++++++++++++++++++++++++ |
12 |
2 files changed, 257 insertions(+) |
13 |
|
14 |
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest |
15 |
index 4bbcd3a..8a780ec 100644 |
16 |
--- a/dev-python/pypy/Manifest |
17 |
+++ b/dev-python/pypy/Manifest |
18 |
@@ -2,5 +2,6 @@ DIST pypy-4.0.1-src.tar.bz2 17172844 SHA256 29f5aa6ba17b34fd980e85172dfeb4086fdc |
19 |
DIST pypy-5.0.0-src.tar.bz2 17223494 SHA256 89027b1b33553b53ff7733dc4838f0a76af23552c0d915d9f6de5875b8d7d4ab SHA512 2af686cdad13a1083114a03a7361f58c4dd482e3a83a63b43f8d40922a11120383f91deb6f1607510c4bbd22fd8c59dcf1b58406c2e5cf5548a48542e1b20f89 WHIRLPOOL 61c9ada98e710019832cb6468e68c8b17e429e48f2ea0480371b2f04521bc77ab774a21dba2280bb40b97e528ad391a83d139bb839461899f9dc214d60683716 |
20 |
DIST pypy-5.1.1-src.tar.bz2 17328934 SHA256 ca3d943d7fbd78bb957ee9e5833ada4bb8506ac99a41b7628790e286a65ed2be SHA512 2d81b62747ac02980c275fe24fff689e93b4b352e6279c55ca570fd76b8477a55f819e81fab4c6ffdb6991f29536c606d75e238d5bbe04518357509020f23ca9 WHIRLPOOL 17f78c8c7df9e07af3fce15392061652284606fbd872706888094ec01d222957c8ee43d2667369377ceb1a9720692d130e4a540bcaff269b4c7d8896b14d708d |
21 |
DIST pypy2-v5.3.0-src.tar.bz2 17361429 SHA256 4142eb8f403810bc88a4911792bb5a502e152df95806e33e69050c828cd160d5 SHA512 6387987b93bebf8ca6d820bde6c42c1a7427a778ff01cf93766df34be792cb1a8d927b3e402f90159df75f68aa1c913a28e9d453e3b13b28489cb68670ef121d WHIRLPOOL 57b9718b1ed72f13005a6d5a60b24d0fdab522ff63b3f91264433cf17f0bb4c5f36e3121d8d92744386fa5d31fbce14711689c85f87a53b68bfdbddaa19a3edd |
22 |
+DIST pypy2-v5.3.1-src.tar.bz2 17361760 SHA256 31a52bab584abf3a0f0defd1bf9a29131dab08df43885e7eeddfc7dc9b71836e SHA512 3138dde3cb1a155e389a2be615601e22f468d2bc77dd219a35b310052fa06f68f80c3ff62fa4d0a9179eae014ace18620d0a076a0528cb155b1c33cc94d6b397 WHIRLPOOL 518b73ec649673fb1fc333b5d0e7669f06e9569624e2f8b55dbbf24b5f109a3b9680ed1d45c6401eb62ee8761043ec9c38a33e6d396c39c3f2fb5ba30f15e93a |
23 |
DIST python-gentoo-patches-2.7.10-0.tar.xz 12892 SHA256 c9a838bd62ae50cc385da23a837acfd05f2b74e4f086c9c76eb4d3aa5366ef6d SHA512 5f100944635e360691dc0a2b340a906646c4ae9ee558246ddffc56e8b15d389f25f1fbdc1db4cc08e7d29560d04d66b058b3904902899d58ecae8c408ebdf056 WHIRLPOOL f69e9a518bb7ee50c1b262a21e70e1e2443f859ee6d2f4fa84421120dbd054a06ce8dd6cfea8512cbc64bce806322b879c25c561d5eb05e1ba6cc15035b373a9 |
24 |
DIST python-gentoo-patches-2.7.11-0.tar.xz 12916 SHA256 e14b47bb1fd64d366d7dfb8339cc2cbf4a53fc288b11dd83f575eb36a8a6408d SHA512 f0447bb699a163afc08df39b111394377539935546ae23732d7239e78d2bff0c04bc94949f86aef0c1be83736127dbd25c2c531e49befed2d638c3cd4940ac52 WHIRLPOOL 305992849d9d244da1e308e739c9bf62a3ef5c74eb65c765bdc666fb5767eb16c7a609f7c442c17da17f76c3ab81e4b09fa8c21e43f89366539a6a9d656bea77 |
25 |
|
26 |
diff --git a/dev-python/pypy/pypy-5.3.1.ebuild b/dev-python/pypy/pypy-5.3.1.ebuild |
27 |
new file mode 100644 |
28 |
index 0000000..6e1cb51 |
29 |
--- /dev/null |
30 |
+++ b/dev-python/pypy/pypy-5.3.1.ebuild |
31 |
@@ -0,0 +1,256 @@ |
32 |
+# Copyright 1999-2016 Gentoo Foundation |
33 |
+# Distributed under the terms of the GNU General Public License v2 |
34 |
+# $Id$ |
35 |
+ |
36 |
+EAPI=5 |
37 |
+ |
38 |
+PYTHON_COMPAT=( python2_7 pypy ) |
39 |
+inherit check-reqs eutils multilib multiprocessing pax-utils python-any-r1 toolchain-funcs versionator |
40 |
+ |
41 |
+CPY_PATCHSET_VERSION="2.7.11-0" |
42 |
+MY_P=pypy2-v${PV} |
43 |
+ |
44 |
+DESCRIPTION="A fast, compliant alternative implementation of the Python language" |
45 |
+HOMEPAGE="http://pypy.org/" |
46 |
+SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2 |
47 |
+ https://dev.gentoo.org/~djc/python-gentoo-patches-${CPY_PATCHSET_VERSION}.tar.xz" |
48 |
+ |
49 |
+LICENSE="MIT" |
50 |
+SLOT="0/$(get_version_component_range 1-2 ${PV})" |
51 |
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
52 |
+IUSE="bzip2 doc gdbm +jit libressl low-memory ncurses sandbox +shadowstack sqlite cpu_flags_x86_sse2 test tk" |
53 |
+ |
54 |
+RDEPEND=">=sys-libs/zlib-1.1.3:0= |
55 |
+ virtual/libffi:0= |
56 |
+ virtual/libintl:0= |
57 |
+ dev-libs/expat:0= |
58 |
+ !libressl? ( dev-libs/openssl:0=[-bindist] ) |
59 |
+ libressl? ( dev-libs/libressl:0= ) |
60 |
+ bzip2? ( app-arch/bzip2:0= ) |
61 |
+ gdbm? ( sys-libs/gdbm:0= ) |
62 |
+ ncurses? ( sys-libs/ncurses:0= ) |
63 |
+ sqlite? ( dev-db/sqlite:3= ) |
64 |
+ tk? ( |
65 |
+ dev-lang/tk:0= |
66 |
+ dev-tcltk/tix:0= |
67 |
+ ) |
68 |
+ !dev-python/pypy-bin:0" |
69 |
+DEPEND="${RDEPEND} |
70 |
+ doc? ( dev-python/sphinx ) |
71 |
+ ${PYTHON_DEPS} |
72 |
+ test? ( dev-python/pytest )" |
73 |
+PDEPEND="app-admin/python-updater" |
74 |
+ |
75 |
+S="${WORKDIR}/${MY_P}-src" |
76 |
+ |
77 |
+pkg_pretend() { |
78 |
+ if [[ ${MERGE_TYPE} != binary ]]; then |
79 |
+ if use low-memory; then |
80 |
+ if ! python_is_installed pypy; then |
81 |
+ eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy" |
82 |
+ eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:" |
83 |
+ eerror |
84 |
+ eerror " $ emerge -1v dev-python/pypy-bin" |
85 |
+ eerror |
86 |
+ eerror "before attempting to build dev-python/pypy[low-memory]." |
87 |
+ die "dev-python/pypy-bin (or dev-python/pypy) needs to be installed for USE=low-memory" |
88 |
+ fi |
89 |
+ |
90 |
+ CHECKREQS_MEMORY="1750M" |
91 |
+ use amd64 && CHECKREQS_MEMORY="3500M" |
92 |
+ else |
93 |
+ CHECKREQS_MEMORY="3G" |
94 |
+ use amd64 && CHECKREQS_MEMORY="6G" |
95 |
+ fi |
96 |
+ |
97 |
+ check-reqs_pkg_pretend |
98 |
+ fi |
99 |
+} |
100 |
+ |
101 |
+pkg_setup() { |
102 |
+ if [[ ${MERGE_TYPE} != binary ]]; then |
103 |
+ pkg_pretend |
104 |
+ |
105 |
+ if python_is_installed pypy; then |
106 |
+ if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then |
107 |
+ einfo "Using already-installed PyPy to perform the translation." |
108 |
+ local EPYTHON=pypy |
109 |
+ else |
110 |
+ einfo "Using ${EPYTHON} to perform the translation. Please note that upstream" |
111 |
+ einfo "recommends using PyPy for that. If you wish to do so, please unset" |
112 |
+ einfo "the EPYTHON variable." |
113 |
+ fi |
114 |
+ fi |
115 |
+ |
116 |
+ python-any-r1_pkg_setup |
117 |
+ fi |
118 |
+} |
119 |
+ |
120 |
+src_prepare() { |
121 |
+ epatch "${FILESDIR}/4.0.0-gentoo-path.patch" \ |
122 |
+ "${FILESDIR}/1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch" \ |
123 |
+ "${FILESDIR}"/2.5.0-shared-lib.patch # 517002 |
124 |
+ |
125 |
+ sed -e "s^@EPREFIX@^${EPREFIX}^" \ |
126 |
+ -e "s^@libdir@^$(get_libdir)^" \ |
127 |
+ -i lib-python/2.7/distutils/command/install.py || die |
128 |
+ |
129 |
+ # apply CPython stdlib patches |
130 |
+ pushd lib-python/2.7 > /dev/null || die |
131 |
+ epatch "${FILESDIR}"/2.5.0_all_distutils_cxx.patch \ |
132 |
+ "${WORKDIR}"/patches/22_all_turkish_locale.patch \ |
133 |
+ "${WORKDIR}"/patches/62_all_xml.use_pyxml.patch |
134 |
+ popd > /dev/null || die |
135 |
+ |
136 |
+ epatch_user |
137 |
+} |
138 |
+ |
139 |
+src_compile() { |
140 |
+ tc-export CC |
141 |
+ |
142 |
+ local jit_backend |
143 |
+ if use jit; then |
144 |
+ jit_backend='--jit-backend=' |
145 |
+ |
146 |
+ # We only need the explicit sse2 switch for x86. |
147 |
+ # On other arches we can rely on autodetection which uses |
148 |
+ # compiler macros. Plus, --jit-backend= doesn't accept all |
149 |
+ # the modern values... |
150 |
+ |
151 |
+ if use x86; then |
152 |
+ if use cpu_flags_x86_sse2; then |
153 |
+ jit_backend+=x86 |
154 |
+ else |
155 |
+ jit_backend+=x86-without-sse2 |
156 |
+ fi |
157 |
+ else |
158 |
+ jit_backend+=auto |
159 |
+ fi |
160 |
+ fi |
161 |
+ |
162 |
+ local args=( |
163 |
+ --shared |
164 |
+ $(usex jit -Ojit -O2) |
165 |
+ $(usex shadowstack --gcrootfinder=shadowstack '') |
166 |
+ $(usex sandbox --sandbox '') |
167 |
+ |
168 |
+ ${jit_backend} |
169 |
+ --make-jobs=$(makeopts_jobs) |
170 |
+ |
171 |
+ pypy/goal/targetpypystandalone |
172 |
+ ) |
173 |
+ |
174 |
+ # Avoid linking against libraries disabled by use flags |
175 |
+ local opts=( |
176 |
+ bzip2:bz2 |
177 |
+ ncurses:_minimal_curses |
178 |
+ ) |
179 |
+ |
180 |
+ local opt |
181 |
+ for opt in "${opts[@]}"; do |
182 |
+ local flag=${opt%:*} |
183 |
+ local mod=${opt#*:} |
184 |
+ |
185 |
+ args+=( |
186 |
+ $(usex ${flag} --withmod --withoutmod)-${mod} |
187 |
+ ) |
188 |
+ done |
189 |
+ |
190 |
+ local interp=( "${PYTHON}" ) |
191 |
+ if use low-memory; then |
192 |
+ interp=( env PYPY_GC_MAX_DELTA=200MB |
193 |
+ "${PYTHON}" --jit loop_longevity=300 ) |
194 |
+ fi |
195 |
+ |
196 |
+ set -- "${interp[@]}" rpython/bin/rpython --batch "${args[@]}" |
197 |
+ echo -e "\033[1m${@}\033[0m" |
198 |
+ "${@}" || die "compile error" |
199 |
+ |
200 |
+ use doc && emake -C pypy/doc/ html |
201 |
+ pax-mark m pypy-c libpypy-c.so |
202 |
+} |
203 |
+ |
204 |
+src_test() { |
205 |
+ # (unset) |
206 |
+ local -x PYTHONDONTWRITEBYTECODE |
207 |
+ |
208 |
+ ./pypy-c ./pypy/test_all.py --pypy=./pypy-c lib-python || die |
209 |
+} |
210 |
+ |
211 |
+src_install() { |
212 |
+ local dest=/usr/$(get_libdir)/pypy |
213 |
+ einfo "Installing PyPy ..." |
214 |
+ insinto "${dest}" |
215 |
+ doins -r include lib_pypy lib-python pypy-c libpypy-c.so |
216 |
+ fperms a+x ${dest}/pypy-c ${dest}/libpypy-c.so |
217 |
+ pax-mark m "${ED%/}${dest}/pypy-c" "${ED%/}${dest}/libpypy-c.so" |
218 |
+ dosym ../$(get_libdir)/pypy/pypy-c /usr/bin/pypy |
219 |
+ dodoc README.rst |
220 |
+ |
221 |
+ if ! use gdbm; then |
222 |
+ rm -r "${ED%/}${dest}"/lib_pypy/gdbm.py \ |
223 |
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_gdbm.py || die |
224 |
+ fi |
225 |
+ if ! use sqlite; then |
226 |
+ rm -r "${ED%/}${dest}"/lib-python/*2.7/sqlite3 \ |
227 |
+ "${ED%/}${dest}"/lib_pypy/_sqlite3.py \ |
228 |
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_sqlite.py || die |
229 |
+ fi |
230 |
+ if ! use tk; then |
231 |
+ rm -r "${ED%/}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \ |
232 |
+ "${ED%/}${dest}"/lib_pypy/_tkinter \ |
233 |
+ "${ED%/}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die |
234 |
+ fi |
235 |
+ |
236 |
+ # Install docs |
237 |
+ use doc && dohtml -r pypy/doc/_build/html/ |
238 |
+ |
239 |
+ einfo "Generating caches and byte-compiling ..." |
240 |
+ |
241 |
+ local -x PYTHON=${ED%/}${dest}/pypy-c |
242 |
+ local -x LD_LIBRARY_PATH="${ED%/}${dest}" |
243 |
+ # we can't use eclass function since PyPy is dumb and always gives |
244 |
+ # paths relative to the interpreter |
245 |
+ local PYTHON_SITEDIR=${EPREFIX}/usr/$(get_libdir)/pypy/site-packages |
246 |
+ python_export pypy EPYTHON |
247 |
+ |
248 |
+ echo "EPYTHON='${EPYTHON}'" > epython.py || die |
249 |
+ python_domodule epython.py |
250 |
+ |
251 |
+ # Generate Grammar and PatternGrammar pickles. |
252 |
+ "${PYTHON}" -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \ |
253 |
+ || die "Generation of Grammar and PatternGrammar pickles failed" |
254 |
+ |
255 |
+ # Generate cffi modules |
256 |
+ # Please keep in sync with pypy/tool/build_cffi_imports.py! |
257 |
+#cffi_build_scripts = { |
258 |
+# "sqlite3": "_sqlite3_build.py", |
259 |
+# "audioop": "_audioop_build.py", |
260 |
+# "tk": "_tkinter/tklib_build.py", |
261 |
+# "curses": "_curses_build.py" if sys.platform != "win32" else None, |
262 |
+# "syslog": "_syslog_build.py" if sys.platform != "win32" else None, |
263 |
+# "gdbm": "_gdbm_build.py" if sys.platform != "win32" else None, |
264 |
+# "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None, |
265 |
+# "resource": "_resource_build.py" if sys.platform != "win32" else None, |
266 |
+ cffi_targets=( audioop syslog pwdgrp resource ) |
267 |
+ use gdbm && cffi_targets+=( gdbm ) |
268 |
+ use ncurses && cffi_targets+=( curses ) |
269 |
+ use sqlite && cffi_targets+=( sqlite3 ) |
270 |
+ use tk && cffi_targets+=( tkinter/tklib ) |
271 |
+ |
272 |
+ local t |
273 |
+ # all modules except tkinter output to . |
274 |
+ # tkinter outputs to the correct dir ... |
275 |
+ cd "${ED%/}${dest}"/lib_pypy || die |
276 |
+ for t in "${cffi_targets[@]}"; do |
277 |
+ # tkinter doesn't work via -m |
278 |
+ "${PYTHON}" "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}" |
279 |
+ done |
280 |
+ |
281 |
+ # Cleanup temporary objects |
282 |
+ find "${ED%/}${dest}" -name "_cffi_*.[co]" -delete || die |
283 |
+ find "${ED%/}${dest}" -type d -empty -delete || die |
284 |
+ |
285 |
+ # compile the installed modules |
286 |
+ python_optimize "${ED%/}${dest}" |
287 |
+} |