2018-04-10 23:31:31 +00:00
|
|
|
%global basever 5.10
|
2015-04-24 22:48:59 +00:00
|
|
|
Name: pypy3
|
2018-04-10 23:31:31 +00:00
|
|
|
Version: %{basever}.1
|
2017-10-20 18:31:31 +00:00
|
|
|
%global pyversion 3.5
|
2018-04-14 08:55:05 +00:00
|
|
|
Release: 8%{?dist}
|
2015-04-24 22:48:59 +00:00
|
|
|
Summary: Python 3 implementation with a Just-In-Time compiler
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
# LGPL and another free license we'd need to ask spot about are present in some
|
|
|
|
# java jars that we're not building with atm (in fact, we're deleting them
|
|
|
|
# before building). If we restore those we'll have to work out the new
|
|
|
|
# licensing terms
|
|
|
|
License: MIT and Python and UCD
|
|
|
|
URL: http://pypy.org/
|
|
|
|
|
2016-10-22 12:52:20 +00:00
|
|
|
# Not available yet
|
2016-11-12 11:51:54 +00:00
|
|
|
ExcludeArch: aarch64
|
2016-10-22 12:52:20 +00:00
|
|
|
|
2011-01-03 20:06:28 +00:00
|
|
|
# High-level configuration of the build:
|
|
|
|
|
|
|
|
# PyPy consists of an implementation of an interpreter (with JIT compilation)
|
|
|
|
# for the full Python language written in a high-level language, leaving many
|
|
|
|
# of the implementation details as "pluggable" policies.
|
|
|
|
#
|
|
|
|
# The implementation language is then compiled down to .c code, from which we
|
|
|
|
# obtain a binary.
|
|
|
|
#
|
|
|
|
# This allows us to build a near-arbitrary collection of different
|
|
|
|
# implementations of Python with differing tradeoffs
|
|
|
|
#
|
|
|
|
# (As it happens, the implementation language is itself Python, albeit a
|
|
|
|
# restricted subset "RPython", chosen to making it amenable to being compiled.
|
|
|
|
# The result implements the full Python language though)
|
|
|
|
|
|
|
|
# We could build many different implementations of Python.
|
|
|
|
# For now, let's focus on the implementation that appears to be receiving the
|
|
|
|
# most attention upstream: the JIT-enabled build, with all standard
|
|
|
|
# optimizations
|
|
|
|
|
|
|
|
# Building a configuration can take significant time:
|
|
|
|
|
|
|
|
# A build of pypy (with jit) on i686 took 77 mins:
|
|
|
|
# [Timer] Timings:
|
|
|
|
# [Timer] annotate --- 583.3 s
|
|
|
|
# [Timer] rtype_lltype --- 760.9 s
|
|
|
|
# [Timer] pyjitpl_lltype --- 567.3 s
|
|
|
|
# [Timer] backendopt_lltype --- 375.6 s
|
|
|
|
# [Timer] stackcheckinsertion_lltype --- 54.1 s
|
|
|
|
# [Timer] database_c --- 852.2 s
|
|
|
|
# [Timer] source_c --- 1007.3 s
|
|
|
|
# [Timer] compile_c --- 419.9 s
|
|
|
|
# [Timer] ===========================================
|
|
|
|
# [Timer] Total: --- 4620.5 s
|
|
|
|
#
|
|
|
|
# A build of pypy (nojit) on x86_64 took about an hour:
|
|
|
|
# [Timer] Timings:
|
|
|
|
# [Timer] annotate --- 537.5 s
|
|
|
|
# [Timer] rtype_lltype --- 667.3 s
|
|
|
|
# [Timer] backendopt_lltype --- 385.4 s
|
|
|
|
# [Timer] stackcheckinsertion_lltype --- 42.5 s
|
|
|
|
# [Timer] database_c --- 625.3 s
|
|
|
|
# [Timer] source_c --- 1040.2 s
|
|
|
|
# [Timer] compile_c --- 273.9 s
|
|
|
|
# [Timer] ===========================================
|
|
|
|
# [Timer] Total: --- 3572.0 s
|
|
|
|
#
|
|
|
|
#
|
|
|
|
# A build of pypy-stackless on i686 took about 87 mins:
|
|
|
|
# [Timer] Timings:
|
|
|
|
# [Timer] annotate --- 584.2 s
|
|
|
|
# [Timer] rtype_lltype --- 777.3 s
|
|
|
|
# [Timer] backendopt_lltype --- 365.9 s
|
|
|
|
# [Timer] stackcheckinsertion_lltype --- 39.3 s
|
|
|
|
# [Timer] database_c --- 1089.6 s
|
|
|
|
# [Timer] source_c --- 1868.6 s
|
|
|
|
# [Timer] compile_c --- 490.4 s
|
|
|
|
# [Timer] ===========================================
|
|
|
|
# [Timer] Total: --- 5215.3 s
|
|
|
|
|
|
|
|
|
2011-04-30 22:24:07 +00:00
|
|
|
# We will build a "pypy" binary.
|
|
|
|
#
|
|
|
|
# Unfortunately, the JIT support is only available on some architectures.
|
|
|
|
#
|
2014-07-07 22:07:38 +00:00
|
|
|
# rpython/jit/backend/detect_cpu.py:getcpuclassname currently supports the
|
2011-01-03 20:06:28 +00:00
|
|
|
# following options:
|
|
|
|
# 'i386', 'x86'
|
|
|
|
# 'x86-without-sse2':
|
|
|
|
# 'x86_64'
|
2014-07-07 22:07:38 +00:00
|
|
|
# 'armv6', 'armv7' (versions 6 and 7, hard- and soft-float ABI)
|
2011-01-03 20:06:28 +00:00
|
|
|
# 'cli'
|
|
|
|
# 'llvm'
|
2011-04-30 22:24:07 +00:00
|
|
|
#
|
|
|
|
# We will only build with JIT support on those architectures, and build without
|
|
|
|
# it on the other archs. The resulting binary will typically be slower than
|
|
|
|
# CPython for the latter case.
|
2014-07-07 22:07:38 +00:00
|
|
|
|
2017-12-27 14:57:17 +00:00
|
|
|
%ifarch %{ix86} x86_64 %{arm} %{power64} s390x
|
2011-01-03 20:06:28 +00:00
|
|
|
%global with_jit 1
|
|
|
|
%else
|
|
|
|
%global with_jit 0
|
|
|
|
%endif
|
|
|
|
|
|
|
|
# Should we build a "pypy-stackless" binary?
|
|
|
|
%global with_stackless 0
|
|
|
|
|
2011-09-13 09:00:09 +00:00
|
|
|
# Should we build the emacs JIT-viewing mode?
|
|
|
|
%if 0%{?rhel} == 5 || 0%{?rhel} == 6
|
|
|
|
%global with_emacs 0
|
|
|
|
%else
|
|
|
|
%global with_emacs 1
|
|
|
|
%endif
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
# Easy way to enable/disable verbose logging:
|
|
|
|
%global verbose_logs 0
|
|
|
|
|
2011-12-16 22:15:41 +00:00
|
|
|
# Forcibly use the shadow-stack option for detecting GC roots, rather than
|
|
|
|
# relying on hacking up generated assembler with regexps:
|
|
|
|
%global shadow_stack 1
|
|
|
|
|
2011-08-19 23:04:38 +00:00
|
|
|
# Easy way to turn off the selftests:
|
|
|
|
%global run_selftests 1
|
|
|
|
|
2018-04-10 23:31:31 +00:00
|
|
|
%global pypyprefix %{_libdir}/pypy3-%{basever}
|
2015-04-24 22:48:59 +00:00
|
|
|
%global pylibver 3
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
# We refer to this subdir of the source tree in a few places during the build:
|
2013-06-24 06:57:35 +00:00
|
|
|
%global goal_dir pypy/goal
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
|
|
|
|
# Turn off the brp-python-bytecompile postprocessing script
|
|
|
|
# We manually invoke it later on, using the freshly built pypy binary
|
|
|
|
%global __os_install_post \
|
|
|
|
%(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
|
|
|
|
|
|
|
|
# Source and patches:
|
2017-10-20 18:31:31 +00:00
|
|
|
Source0: https://bitbucket.org/pypy/pypy/downloads/pypy3-v%{version}-src.tar.bz2
|
2011-01-03 20:06:28 +00:00
|
|
|
|
2011-08-25 15:58:55 +00:00
|
|
|
# Supply various useful RPM macros for building python modules against pypy:
|
|
|
|
# __pypy, pypy_sitelib, pypy_sitearch
|
2016-07-08 12:38:18 +00:00
|
|
|
Source2: macros.pypy3
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
# By default, if built at a tty, the translation process renders a Mandelbrot
|
|
|
|
# set to indicate progress.
|
|
|
|
# This obscures useful messages, and may waste CPU cycles, so suppress it, and
|
|
|
|
# merely render dots:
|
2017-10-20 18:31:31 +00:00
|
|
|
Patch1: 001-nevertty.patch
|
2011-01-06 22:09:03 +00:00
|
|
|
|
2012-07-10 20:45:52 +00:00
|
|
|
# Patch pypy.translator.platform so that stdout from "make" etc gets logged,
|
|
|
|
# rather than just stderr, so that the command-line invocations of the compiler
|
|
|
|
# and linker are captured:
|
2017-10-20 18:31:31 +00:00
|
|
|
Patch6: 006-always-log-stdout.patch
|
2012-07-10 20:45:52 +00:00
|
|
|
|
|
|
|
# Disable the printing of a quote from IRC on startup (these are stored in
|
|
|
|
# ROT13 form in lib_pypy/_pypy_irc_topic.py). Some are cute, but some could
|
|
|
|
# cause confusion for end-users (and many are in-jokes within the PyPy
|
|
|
|
# community that won't make sense outside of it). [Sorry to be a killjoy]
|
2017-10-20 18:31:31 +00:00
|
|
|
Patch7: 007-remove-startup-message.patch
|
2016-07-01 13:59:13 +00:00
|
|
|
|
2018-03-29 19:24:14 +00:00
|
|
|
# Glibc's libcrypt was replaced with libxcrypt in f28, crypt.h header has
|
|
|
|
# to be added to privent compilation error.
|
|
|
|
# https://fedoraproject.org/wiki/Changes/Replace_glibc_libcrypt_with_libxcrypt
|
|
|
|
Patch9: 009-add-libxcrypt-support.patch
|
|
|
|
|
2016-11-03 18:49:28 +00:00
|
|
|
# It seems ppc64 has no faulthandler
|
2017-10-20 18:31:31 +00:00
|
|
|
Patch11: 011-no-faulthandler.patch
|
2016-11-03 18:49:28 +00:00
|
|
|
|
2011-01-03 20:06:28 +00:00
|
|
|
# Build-time requirements:
|
|
|
|
|
2011-01-06 22:09:03 +00:00
|
|
|
# pypy's can be rebuilt using itself, rather than with CPython; doing so
|
|
|
|
# halves the build time.
|
|
|
|
#
|
|
|
|
# Turn it off with this boolean, to revert back to rebuilding using CPython
|
|
|
|
# and avoid a cycle in the build-time dependency graph:
|
2015-05-04 10:49:51 +00:00
|
|
|
# Note, pypy3 is built with pypy2, so no dependency cycle
|
|
|
|
|
2017-12-29 18:50:56 +00:00
|
|
|
%ifarch %{power64}
|
|
|
|
# the build is unreliable with pypy+power, getting random failures
|
|
|
|
# so better have a bit slower build than having to build until it pass
|
|
|
|
%global use_self_when_building 0
|
|
|
|
%else
|
2017-12-28 16:47:00 +00:00
|
|
|
%global use_self_when_building 1
|
2017-12-29 18:50:56 +00:00
|
|
|
%endif
|
|
|
|
|
2011-01-06 22:09:03 +00:00
|
|
|
%if 0%{use_self_when_building}
|
2015-04-24 22:48:59 +00:00
|
|
|
# pypy3 can only be build with pypy2
|
2017-12-26 10:56:15 +00:00
|
|
|
BuildRequires: pypy2
|
2017-10-20 18:31:31 +00:00
|
|
|
# no pypy-pycparser available ATM
|
2018-04-14 08:55:05 +00:00
|
|
|
%global bootstrap_python_interp pypy2
|
2011-01-06 22:09:03 +00:00
|
|
|
%else
|
2011-09-13 01:01:16 +00:00
|
|
|
|
2015-04-24 22:48:59 +00:00
|
|
|
|
|
|
|
# pypy3 can only be build with python2
|
2015-04-28 17:58:39 +00:00
|
|
|
BuildRequires: python2-devel
|
2017-12-26 10:56:15 +00:00
|
|
|
BuildRequires: python2-pycparser
|
2018-04-14 08:55:05 +00:00
|
|
|
%global bootstrap_python_interp python2
|
2011-01-06 22:09:03 +00:00
|
|
|
|
2011-09-13 01:01:16 +00:00
|
|
|
%endif
|
2011-01-06 22:09:03 +00:00
|
|
|
|
2011-01-03 20:06:28 +00:00
|
|
|
BuildRequires: libffi-devel
|
2014-01-02 09:45:26 +00:00
|
|
|
BuildRequires: tcl-devel
|
|
|
|
BuildRequires: tk-devel
|
|
|
|
|
|
|
|
BuildRequires: sqlite-devel
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
BuildRequires: zlib-devel
|
|
|
|
BuildRequires: bzip2-devel
|
|
|
|
BuildRequires: ncurses-devel
|
|
|
|
BuildRequires: expat-devel
|
2016-07-08 12:38:18 +00:00
|
|
|
BuildRequires: gdbm-devel
|
|
|
|
BuildRequires: xz-devel
|
2014-05-27 21:16:43 +00:00
|
|
|
%ifnarch s390
|
2011-01-03 20:06:28 +00:00
|
|
|
BuildRequires: valgrind-devel
|
2011-01-07 16:56:06 +00:00
|
|
|
%endif
|
2011-01-03 20:06:28 +00:00
|
|
|
|
2016-10-22 12:11:41 +00:00
|
|
|
%if 0%{?fedora} >= 26
|
|
|
|
BuildRequires: compat-openssl10-devel
|
|
|
|
%else
|
|
|
|
BuildRequires: openssl-devel
|
|
|
|
%endif
|
|
|
|
|
2011-08-19 23:04:38 +00:00
|
|
|
%if %{run_selftests}
|
2011-01-03 20:06:28 +00:00
|
|
|
# Used by the selftests, though not by the build:
|
|
|
|
BuildRequires: gc-devel
|
|
|
|
|
2011-08-19 23:04:38 +00:00
|
|
|
# For use in the selftests, for recording stats:
|
|
|
|
BuildRequires: time
|
2016-11-08 12:57:41 +00:00
|
|
|
BuildRequires: /usr/bin/free
|
2011-08-19 23:04:38 +00:00
|
|
|
|
|
|
|
# For use in the selftests, for imposing a per-test timeout:
|
2017-07-12 12:43:49 +00:00
|
|
|
BuildRequires: perl-interpreter
|
2011-08-19 23:04:38 +00:00
|
|
|
%endif
|
|
|
|
|
2011-01-03 20:06:28 +00:00
|
|
|
BuildRequires: /usr/bin/execstack
|
|
|
|
|
2011-08-03 17:02:57 +00:00
|
|
|
# For byte-compiling the JIT-viewing mode:
|
2011-09-13 09:00:09 +00:00
|
|
|
%if %{with_emacs}
|
2011-08-03 17:02:57 +00:00
|
|
|
BuildRequires: emacs
|
2011-09-13 09:00:09 +00:00
|
|
|
%endif
|
2011-08-03 17:02:57 +00:00
|
|
|
|
2015-05-04 10:48:44 +00:00
|
|
|
# For %%autosetup -S git
|
2018-01-19 15:19:55 +00:00
|
|
|
BuildRequires: %{_bindir}/git
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
# Metadata for the core package (the JIT build):
|
2018-04-11 22:23:12 +00:00
|
|
|
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
|
|
|
Provides: %{name}(abi) = %{basever}
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
%description
|
2015-04-24 22:48:59 +00:00
|
|
|
PyPy's implementation of Python 3, featuring a Just-In-Time compiler on some CPU
|
2011-04-30 22:24:07 +00:00
|
|
|
architectures, and various optimized implementations of the standard types
|
|
|
|
(strings, dictionaries, etc)
|
|
|
|
|
|
|
|
%if 0%{with_jit}
|
|
|
|
This build of PyPy has JIT-compilation enabled.
|
|
|
|
%else
|
|
|
|
This build of PyPy has JIT-compilation disabled, as it is not supported on this
|
|
|
|
CPU architecture.
|
|
|
|
%endif
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
|
|
|
|
%package libs
|
2015-04-24 22:48:59 +00:00
|
|
|
Summary: Run-time libraries used by PyPy implementations of Python 3
|
2011-08-03 17:02:57 +00:00
|
|
|
|
|
|
|
# We supply an emacs mode for the JIT viewer.
|
|
|
|
# (This doesn't bring in all of emacs, just the directory structure)
|
2011-09-13 09:00:09 +00:00
|
|
|
%if %{with_emacs}
|
2011-08-03 17:02:57 +00:00
|
|
|
Requires: emacs-filesystem >= %{_emacs_version}
|
2011-09-13 09:00:09 +00:00
|
|
|
%endif
|
2011-08-03 17:02:57 +00:00
|
|
|
|
2011-01-03 20:06:28 +00:00
|
|
|
%description libs
|
2015-04-24 22:48:59 +00:00
|
|
|
Libraries required by the various PyPy implementations of Python 3.
|
2011-01-03 20:06:28 +00:00
|
|
|
|
2011-01-14 00:51:26 +00:00
|
|
|
|
|
|
|
%package devel
|
2015-04-24 22:48:59 +00:00
|
|
|
Summary: Development tools for working with PyPy3
|
2016-07-08 12:38:18 +00:00
|
|
|
Requires: pypy3%{?_isa} = %{version}-%{release}
|
2014-09-02 07:57:46 +00:00
|
|
|
|
2011-01-14 00:51:26 +00:00
|
|
|
%description devel
|
2015-04-24 22:48:59 +00:00
|
|
|
Header files for building C extension modules against PyPy3
|
2011-01-14 00:51:26 +00:00
|
|
|
|
|
|
|
|
2011-01-03 20:06:28 +00:00
|
|
|
%if 0%{with_stackless}
|
|
|
|
%package stackless
|
2015-04-24 22:48:59 +00:00
|
|
|
Summary: Stackless Python interpreter built using PyPy3
|
2016-07-08 12:38:18 +00:00
|
|
|
Requires: pypy3-libs%{?_isa} = %{version}-%{release}
|
2011-01-03 20:06:28 +00:00
|
|
|
%description stackless
|
2015-04-24 22:48:59 +00:00
|
|
|
Build of PyPy3 with support for micro-threads for massive concurrency
|
2011-01-03 20:06:28 +00:00
|
|
|
%endif
|
|
|
|
|
|
|
|
%prep
|
2016-10-22 12:11:41 +00:00
|
|
|
%autosetup -n pypy3-v%{version}-src -p1 -S git
|
2011-01-03 20:06:28 +00:00
|
|
|
|
2018-04-14 08:55:05 +00:00
|
|
|
# Replace /usr/local/bin/python or /usr/bin/env python shebangs with /usr/bin/python2 or pypy2:
|
2011-01-03 20:06:28 +00:00
|
|
|
find -name "*.py" -exec \
|
|
|
|
sed \
|
2018-04-14 08:55:05 +00:00
|
|
|
-i -r -e "s@/usr/(local/)?bin/(env )?python(2|3)?@/usr/bin/%{bootstrap_python_interp}@" \
|
2011-01-03 20:06:28 +00:00
|
|
|
"{}" \
|
|
|
|
\;
|
|
|
|
|
2013-06-24 06:57:35 +00:00
|
|
|
for f in rpython/translator/goal/bpnn.py ; do
|
2011-01-03 20:06:28 +00:00
|
|
|
# Detect shebang lines && remove them:
|
|
|
|
sed -e '/^#!/Q 0' -e 'Q 1' $f \
|
|
|
|
&& sed -i '1d' $f
|
|
|
|
chmod a-x $f
|
|
|
|
done
|
|
|
|
|
2018-04-14 08:55:05 +00:00
|
|
|
# Replace all lib-python and lib_pypy python shebangs with pypy3 (those will be shipped with pypy3-libs)
|
|
|
|
find lib-python/%{pylibver} lib_pypy -name "*.py" -exec \
|
|
|
|
sed -r -i '1s@^#!\s*/usr/bin.*(python|pypy).*@#!/usr/bin/%{name}@' \
|
2015-05-05 16:32:38 +00:00
|
|
|
"{}" \
|
|
|
|
\;
|
2013-08-16 08:12:29 +00:00
|
|
|
|
2018-04-14 22:25:48 +00:00
|
|
|
# Not needed on Linux
|
|
|
|
rm lib-python/3/idlelib/idle.bat
|
|
|
|
|
2016-11-12 13:10:01 +00:00
|
|
|
%ifarch %{ix86} x86_64 %{arm}
|
|
|
|
sed -i -r 's/\$\(LDFLAGSEXTRA\)/& -fuse-ld=gold/' ./rpython/translator/platform/posix.py
|
|
|
|
%endif
|
2016-11-12 11:51:54 +00:00
|
|
|
|
2011-01-03 20:06:28 +00:00
|
|
|
%build
|
2016-11-13 08:22:11 +00:00
|
|
|
%ifarch s390 s390x
|
|
|
|
# pypy3 requires z10 at least
|
|
|
|
%global optflags %(echo %{optflags} | sed 's/-march=z9-109 /-march=z10 /')
|
|
|
|
%endif
|
|
|
|
|
2016-11-12 11:51:54 +00:00
|
|
|
# Top memory usage is about 4.5GB on arm7hf
|
2016-11-08 12:50:10 +00:00
|
|
|
free
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
BuildPyPy() {
|
|
|
|
ExeName=$1
|
|
|
|
Options=$2
|
|
|
|
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "STARTING BUILD OF: $ExeName"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
|
|
|
|
pushd %{goal_dir}
|
|
|
|
|
|
|
|
# The build involves invoking a python script, passing in particular
|
|
|
|
# arguments, environment variables, etc.
|
|
|
|
# Some notes on those follow:
|
|
|
|
|
|
|
|
# The generated binary embeds copies of the values of all environment
|
|
|
|
# variables. We need to unset "RPM_BUILD_ROOT" to avoid a fatal error from
|
|
|
|
# /usr/lib/rpm/check-buildroot
|
|
|
|
# during the postprocessing of the rpmbuild, complaining about this
|
|
|
|
# reference to the buildroot
|
|
|
|
|
|
|
|
|
|
|
|
# By default, pypy's autogenerated C code is placed in
|
|
|
|
# /tmp/usession-N
|
|
|
|
#
|
|
|
|
# and it appears that this stops rpm from extracting the source code to the
|
|
|
|
# debuginfo package
|
|
|
|
#
|
|
|
|
# The logic in pypy-1.4/pypy/tool/udir.py indicates that it is generated in:
|
|
|
|
# $PYPY_USESSION_DIR/usession-$PYPY_USESSION_BASENAME-N
|
|
|
|
# and so we set PYPY_USESSION_DIR so that this tempdir is within the build
|
|
|
|
# location, and set $PYPY_USESSION_BASENAME so that the tempdir is unique
|
|
|
|
# for each invocation of BuildPyPy
|
|
|
|
|
|
|
|
# Compilation flags for C code:
|
|
|
|
# pypy-1.4/pypy/translator/c/genc.py:gen_makefile
|
|
|
|
# assembles a Makefile within
|
|
|
|
# THE_UDIR/testing_1/Makefile
|
|
|
|
# calling out to platform.gen_makefile
|
|
|
|
# For us, that's
|
|
|
|
# pypy-1.4/pypy/translator/platform/linux.py: class BaseLinux(BasePosix):
|
|
|
|
# which by default has:
|
|
|
|
# CFLAGS = ['-O3', '-pthread', '-fomit-frame-pointer',
|
|
|
|
# '-Wall', '-Wno-unused']
|
|
|
|
# plus all substrings from CFLAGS in the environment.
|
|
|
|
# This is used to generate a value for CFLAGS that's written into the Makefile
|
|
|
|
|
2011-12-16 22:15:41 +00:00
|
|
|
# How will we track garbage-collection roots in the generated code?
|
|
|
|
# http://pypy.readthedocs.org/en/latest/config/translation.gcrootfinder.html
|
|
|
|
|
|
|
|
%if 0%{shadow_stack}
|
|
|
|
# This is the most portable option, and avoids a reliance on non-guaranteed
|
|
|
|
# behaviors within GCC's code generator: use an explicitly-maintained stack
|
|
|
|
# of root pointers:
|
2015-05-04 10:47:32 +00:00
|
|
|
%global gcrootfinder_options --gcrootfinder=shadowstack
|
2011-12-16 22:15:41 +00:00
|
|
|
|
2016-07-08 12:38:18 +00:00
|
|
|
export CFLAGS=$(echo "$RPM_OPT_FLAGS")
|
2011-12-16 22:15:41 +00:00
|
|
|
|
|
|
|
%else
|
|
|
|
# Go with the default, which is "asmgcc"
|
|
|
|
|
2015-05-04 10:47:32 +00:00
|
|
|
%global gcrootfinder_options %{nil}
|
2011-12-16 22:15:41 +00:00
|
|
|
|
2011-01-03 20:06:28 +00:00
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=588941#c18
|
|
|
|
# The generated Makefile compiles the .c files into assembler (.s), rather
|
|
|
|
# than direct to .o It then post-processes this assembler to locate
|
|
|
|
# garbage-collection roots (building .lbl.s and .gcmap files, and a
|
|
|
|
# "gcmaptable.s"). (The modified .lbl.s files have extra code injected
|
|
|
|
# within them).
|
|
|
|
# Unfortunately, the code to do this:
|
|
|
|
# pypy-1.4/pypy/translator/c/gcc/trackgcroot.py
|
|
|
|
# doesn't interract well with the results of using our standard build flags.
|
|
|
|
# For now, filter our CFLAGS of everything that could be conflicting with
|
|
|
|
# pypy. Need to check these and reenable ones that are okay later.
|
2011-01-06 22:09:03 +00:00
|
|
|
# Filed as https://bugzilla.redhat.com/show_bug.cgi?id=666966
|
2016-07-08 12:38:18 +00:00
|
|
|
export CFLAGS=$(echo "$RPM_OPT_FLAGS" | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//' -e 's/-fexceptions//' -e 's/-fstack-protector//' -e 's/--param=ssp-buffer-size=4//' -e 's/-O2//' -e 's/-fasynchronous-unwind-tables//' -e 's/-march=i686//' -e 's/-mtune=atom//')
|
2011-01-03 20:06:28 +00:00
|
|
|
|
2011-12-16 22:15:41 +00:00
|
|
|
%endif
|
|
|
|
|
|
|
|
# The generated C code leads to many thousands of warnings of the form:
|
|
|
|
# warning: variable 'l_v26003' set but not used [-Wunused-but-set-variable]
|
|
|
|
# Suppress them:
|
2012-06-18 08:50:36 +00:00
|
|
|
export CFLAGS=$(echo "$CFLAGS" -Wno-unused -fPIC)
|
2011-12-16 22:15:41 +00:00
|
|
|
|
2011-01-03 20:06:28 +00:00
|
|
|
# If we're already built the JIT-enabled "pypy", then use it for subsequent
|
|
|
|
# builds (of other configurations):
|
|
|
|
if test -x './pypy' ; then
|
|
|
|
INTERP='./pypy'
|
|
|
|
else
|
2011-01-06 22:09:03 +00:00
|
|
|
# First pypy build within this rpm build?
|
|
|
|
# Fall back to using the bootstrap python interpreter, which might be a
|
|
|
|
# system copy of pypy from an earlier rpm, or be cpython's /usr/bin/python:
|
|
|
|
INTERP='%{bootstrap_python_interp}'
|
2011-01-03 20:06:28 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
# Here's where we actually invoke the build:
|
|
|
|
time \
|
|
|
|
RPM_BUILD_ROOT= \
|
|
|
|
PYPY_USESSION_DIR=$(pwd) \
|
|
|
|
PYPY_USESSION_BASENAME=$ExeName \
|
2013-06-24 06:57:35 +00:00
|
|
|
$INTERP ../../rpython/bin/rpython \
|
2011-12-16 22:15:41 +00:00
|
|
|
%{gcrootfinder_options} \
|
2013-06-24 06:57:35 +00:00
|
|
|
$Options \
|
|
|
|
targetpypystandalone
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "FINISHED BUILDING: $ExeName"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
|
|
|
|
popd
|
|
|
|
}
|
|
|
|
|
|
|
|
BuildPyPy \
|
2016-07-08 12:38:18 +00:00
|
|
|
pypy3 \
|
2011-04-30 22:24:07 +00:00
|
|
|
%if 0%{with_jit}
|
|
|
|
"-Ojit" \
|
fix build on non-jit arches
Build on non-jit arch like s390 fails with
[translation:info] Translating target as defined by targetpypystandalone
[platform:msg] Setting platform to 'host' cc=None
Traceback (most recent call last):
File "translate.py", line 322, in <module>
main()
File "translate.py", line 208, in main
targetspec_dic, translateconfig, config, args = parse_options_and_load_target()
File "translate.py", line 176, in parse_options_and_load_target
targetspec_dic['handle_config'](config, translateconfig)
File "targetpypystandalone.py", line 109, in handle_config
raise Exception("You have to specify the --opt level.\n"
Exception: You have to specify the --opt level.
Try --opt=2 or --opt=jit, or equivalently -O2 or -Ojit .
2011-05-11 08:15:52 +00:00
|
|
|
%else
|
|
|
|
"-O2" \
|
2011-01-03 20:06:28 +00:00
|
|
|
%endif
|
2011-04-30 22:24:07 +00:00
|
|
|
%{nil}
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
%if 0%{with_stackless}
|
|
|
|
BuildPyPy \
|
2016-07-08 12:38:18 +00:00
|
|
|
pypy3-stackless \
|
2011-01-03 20:06:28 +00:00
|
|
|
"--stackless"
|
|
|
|
%endif
|
|
|
|
|
2011-09-13 09:00:09 +00:00
|
|
|
%if %{with_emacs}
|
2013-06-24 06:57:35 +00:00
|
|
|
%{_emacs_bytecompile} rpython/jit/tool/pypytrace-mode.el
|
2011-09-13 09:00:09 +00:00
|
|
|
%endif
|
2011-08-03 17:02:57 +00:00
|
|
|
|
2013-08-16 08:12:29 +00:00
|
|
|
|
2011-01-03 20:06:28 +00:00
|
|
|
%install
|
|
|
|
mkdir -p %{buildroot}/%{_bindir}
|
2012-01-31 09:53:38 +00:00
|
|
|
mkdir -p %{buildroot}/%{pypyprefix}
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
|
2018-04-10 23:31:31 +00:00
|
|
|
# Run installing script, archive-name %{name}-%{basever} in %{buildroot}/%{_libdir} == %{pypyprefix}
|
|
|
|
%{bootstrap_python_interp} pypy/tool/release/package.py --archive-name %{name}-%{basever} --builddir %{buildroot}/%{_libdir}
|
2011-01-03 20:06:28 +00:00
|
|
|
|
2012-12-13 11:16:11 +00:00
|
|
|
|
2011-01-03 20:06:28 +00:00
|
|
|
# Remove shebang lines from .py files that aren't executable, and
|
|
|
|
# remove executability from .py files that don't have a shebang line:
|
|
|
|
find \
|
|
|
|
%{buildroot} \
|
|
|
|
-name "*.py" \
|
|
|
|
\( \
|
|
|
|
\( \! -perm /u+x,g+x,o+x -exec sed -e '/^#!/Q 0' -e 'Q 1' {} \; \
|
|
|
|
-print -exec sed -i '1d' {} \; \
|
|
|
|
\) \
|
|
|
|
-o \
|
|
|
|
\( \
|
|
|
|
-perm /u+x,g+x,o+x ! -exec grep -m 1 -q '^#!' {} \; \
|
|
|
|
-exec chmod a-x {} \; \
|
|
|
|
\) \
|
|
|
|
\)
|
|
|
|
|
|
|
|
mkdir -p %{buildroot}/%{pypyprefix}/site-packages
|
|
|
|
|
2017-12-29 13:12:06 +00:00
|
|
|
# The generated machine code doesn't need an executable stack, but
|
|
|
|
# one of the assembler files (gcmaptable.s) doesn't have the necessary
|
|
|
|
# metadata to inform gcc of that, and thus gcc pessimistically assumes
|
|
|
|
# that the built binary does need an executable stack.
|
|
|
|
#
|
|
|
|
# Reported upstream as: https://codespeak.net/issue/pypy-dev/issue610
|
|
|
|
#
|
|
|
|
# I tried various approaches involving fixing the build, but the simplest
|
|
|
|
# approach is to postprocess the ELF file:
|
|
|
|
execstack --clear-execstack %{buildroot}/%{pypyprefix}/bin/pypy3
|
|
|
|
|
2017-10-20 18:31:31 +00:00
|
|
|
ln -s ./pypy3 %{buildroot}%{pypyprefix}/bin/pypy%{pyversion}
|
|
|
|
ln -s %{pypyprefix}/bin/pypy%{pyversion} %{buildroot}%{_bindir}/pypy%{pyversion}
|
|
|
|
ln -s pypy%{pyversion} %{buildroot}%{_bindir}/pypy3
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
# pypy uses .pyc files by default (--objspace-usepycfiles), but has a slightly
|
|
|
|
# different bytecode format to CPython. It doesn't use .pyo files: the -O flag
|
|
|
|
# is treated as a "dummy optimization flag for compatibility with C Python"
|
|
|
|
#
|
|
|
|
# pypy-1.4/pypy/module/imp/importing.py has this comment:
|
|
|
|
# XXX picking a magic number is a mess. So far it works because we
|
|
|
|
# have only two extra opcodes, which bump the magic number by +1 and
|
|
|
|
# +2 respectively, and CPython leaves a gap of 10 when it increases
|
|
|
|
# its own magic number. To avoid assigning exactly the same numbers
|
|
|
|
# as CPython we always add a +2. We'll have to think again when we
|
|
|
|
# get at the fourth new opcode :-(
|
|
|
|
#
|
|
|
|
# * CALL_LIKELY_BUILTIN +1
|
|
|
|
# * CALL_METHOD +2
|
|
|
|
#
|
|
|
|
# In other words:
|
|
|
|
#
|
|
|
|
# default_magic -- used by CPython without the -U option
|
|
|
|
# default_magic + 1 -- used by CPython with the -U option
|
|
|
|
# default_magic + 2 -- used by PyPy without any extra opcode
|
|
|
|
# ...
|
|
|
|
# default_magic + 5 -- used by PyPy with both extra opcodes
|
|
|
|
#
|
|
|
|
|
|
|
|
# pypy-1.4/pypy/interpreter/pycode.py has:
|
|
|
|
#
|
|
|
|
# default_magic = (62141+2) | 0x0a0d0000 # this PyPy's magic
|
|
|
|
# # (62131=CPython 2.5.1)
|
|
|
|
# giving a value for "default_magic" for PyPy of 0xa0df2bf.
|
|
|
|
# Note that this corresponds to the "default_magic + 2" from the comment above
|
|
|
|
|
|
|
|
# In my builds:
|
|
|
|
# $ ./pypy --info | grep objspace.opcodes
|
|
|
|
# objspace.opcodes.CALL_LIKELY_BUILTIN: False
|
|
|
|
# objspace.opcodes.CALL_METHOD: True
|
|
|
|
# so I'd expect the magic number to be:
|
|
|
|
# 0x0a0df2bf + 2 (the flag for CALL_METHOD)
|
|
|
|
# giving
|
|
|
|
# 0x0a0df2c1
|
|
|
|
#
|
|
|
|
# I'm seeing
|
|
|
|
# c1 f2 0d 0a
|
|
|
|
# as the first four bytes of the .pyc files, which is consistent with this.
|
|
|
|
|
|
|
|
|
|
|
|
# Bytecompile all of the .py files we ship, using our pypy binary, giving us
|
|
|
|
# .pyc files for pypy. The script actually does the work twice (passing in -O
|
|
|
|
# the second time) but it's simplest to reuse that script.
|
|
|
|
#
|
|
|
|
# The script has special-casing for .py files below
|
|
|
|
# /usr/lib{64}/python[0-9].[0-9]
|
|
|
|
# but given that we're installing into a different path, the supplied "default"
|
|
|
|
# implementation gets used instead.
|
|
|
|
#
|
|
|
|
# Note that some of the test files deliberately contain syntax errors, so
|
|
|
|
# we pass 0 for the second argument ("errors_terminate"):
|
|
|
|
/usr/lib/rpm/brp-python-bytecompile \
|
2016-07-08 12:38:18 +00:00
|
|
|
%{buildroot}%{pypyprefix}/bin/pypy3 \
|
2011-01-03 20:06:28 +00:00
|
|
|
0
|
|
|
|
|
2016-07-08 12:38:18 +00:00
|
|
|
%{buildroot}%{pypyprefix}/bin/pypy3 -c 'import _tkinter'
|
|
|
|
%{buildroot}%{pypyprefix}/bin/pypy3 -c 'import tkinter'
|
|
|
|
%{buildroot}%{pypyprefix}/bin/pypy3 -c 'import _sqlite3'
|
|
|
|
%{buildroot}%{pypyprefix}/bin/pypy3 -c 'import _curses'
|
|
|
|
%{buildroot}%{pypyprefix}/bin/pypy3 -c 'import curses'
|
|
|
|
%{buildroot}%{pypyprefix}/bin/pypy3 -c 'import syslog'
|
|
|
|
%{buildroot}%{pypyprefix}/bin/pypy3 -c 'from _sqlite3 import *'
|
2011-01-14 00:51:26 +00:00
|
|
|
|
|
|
|
# Header files for C extension modules.
|
|
|
|
# Upstream's packaging process (pypy/tool/release/package.py)
|
|
|
|
# creates an "include" subdir and copies all *.h/*.inl from "include" there
|
|
|
|
# (it also has an apparently out-of-date comment about copying them from
|
|
|
|
# pypy/_interfaces, but this directory doesn't seem to exist, and it doesn't
|
|
|
|
# seem to do this as of 2011-01-13)
|
|
|
|
|
|
|
|
# FIXME: arguably these should be instead put into a subdir below /usr/include,
|
|
|
|
# it's not yet clear to me how upstream plan to deal with the C extension
|
|
|
|
# interface going forward, so let's just mimic upstream for now.
|
|
|
|
%global pypy_include_dir %{pypyprefix}/include
|
2016-07-08 12:38:18 +00:00
|
|
|
mkdir -p %{buildroot}%{pypy_include_dir}
|
|
|
|
rm -f %{buildroot}%{pypy_include_dir}/README
|
2011-01-14 00:51:26 +00:00
|
|
|
|
|
|
|
|
2011-01-06 22:09:03 +00:00
|
|
|
# Capture the RPython source code files from the build within the debuginfo
|
|
|
|
# package (rhbz#666975)
|
|
|
|
%global pypy_debuginfo_dir /usr/src/debug/pypy-%{version}-src
|
|
|
|
mkdir -p %{buildroot}%{pypy_debuginfo_dir}
|
|
|
|
|
|
|
|
# copy over everything:
|
|
|
|
cp -a pypy %{buildroot}%{pypy_debuginfo_dir}
|
|
|
|
|
2012-07-10 20:45:52 +00:00
|
|
|
# ...then delete files that aren't:
|
|
|
|
# - *.py files
|
|
|
|
# - the Makefile
|
|
|
|
# - typeids.txt
|
|
|
|
# - dynamic-symbols-*
|
2011-01-06 22:09:03 +00:00
|
|
|
find \
|
2012-07-10 20:45:52 +00:00
|
|
|
%{buildroot}%{pypy_debuginfo_dir} \
|
|
|
|
\( -type f \
|
|
|
|
-a \
|
|
|
|
\! \( -name "*.py" \
|
|
|
|
-o \
|
|
|
|
-name "Makefile" \
|
|
|
|
-o \
|
|
|
|
-name "typeids.txt" \
|
|
|
|
-o \
|
|
|
|
-name "dynamic-symbols-*" \
|
|
|
|
\) \
|
|
|
|
\) \
|
2011-01-06 22:09:03 +00:00
|
|
|
-delete
|
|
|
|
|
2012-07-10 20:45:52 +00:00
|
|
|
# Alternatively, we could simply keep everything. This leads to a ~350MB
|
|
|
|
# debuginfo package, but it makes it easy to hack on the Makefile and C build
|
|
|
|
# flags by rebuilding/linking the sources.
|
|
|
|
# To do so, remove the above "find" command.
|
|
|
|
|
2011-01-06 22:09:03 +00:00
|
|
|
# We don't need bytecode for these files; they are being included for reference
|
|
|
|
# purposes.
|
|
|
|
# There are some rpmlint warnings from these files:
|
|
|
|
# non-executable-script
|
|
|
|
# wrong-script-interpreter
|
|
|
|
# zero-length
|
|
|
|
# script-without-shebang
|
|
|
|
# dangling-symlink
|
|
|
|
# but given that the objective is to preserve a copy of the source code, those
|
|
|
|
# are acceptable.
|
|
|
|
|
2011-08-03 17:02:57 +00:00
|
|
|
# Install the JIT trace mode for Emacs:
|
2011-09-13 09:00:09 +00:00
|
|
|
%if %{with_emacs}
|
2016-11-12 14:29:11 +00:00
|
|
|
mkdir -p %{buildroot}/%{_emacs_sitelispdir}
|
|
|
|
cp -a rpython/jit/tool/pypytrace-mode.el %{buildroot}/%{_emacs_sitelispdir}/pypy3trace-mode.el
|
|
|
|
cp -a rpython/jit/tool/pypytrace-mode.elc %{buildroot}/%{_emacs_sitelispdir}/pypy3trace-mode.elc
|
2011-09-13 09:00:09 +00:00
|
|
|
%endif
|
2011-08-03 17:02:57 +00:00
|
|
|
|
2011-08-25 15:58:55 +00:00
|
|
|
# Install macros for rpm:
|
2016-11-12 11:51:35 +00:00
|
|
|
install -m0644 -p -D -t %{buildroot}/%{_rpmconfigdir}/macros.d %{SOURCE2}
|
2011-08-25 15:58:55 +00:00
|
|
|
|
2016-07-08 12:38:18 +00:00
|
|
|
# Remove files we don't want:
|
2018-04-10 23:31:31 +00:00
|
|
|
rm -f %{buildroot}%{_libdir}/%{name}-%{basever}.tar.bz2 \
|
2016-11-12 11:51:35 +00:00
|
|
|
%{buildroot}%{pypyprefix}/LICENSE \
|
|
|
|
%{buildroot}%{pypyprefix}/README.rst
|
2015-04-28 18:05:42 +00:00
|
|
|
|
2016-11-08 04:43:54 +00:00
|
|
|
# wtf? This is probably masking some bigger problem, but let's do this for now
|
|
|
|
mv -v lib-python/3/test/regrtest.py-new lib-python/3/test/regrtest.py || :
|
|
|
|
|
2017-12-29 13:12:06 +00:00
|
|
|
# since 5.10.0, the debug binaries are built and shipped, making the
|
|
|
|
# pypy3 package ~350 MiB. let's remove them here for now and TODO figure out why
|
|
|
|
rm -f %{buildroot}%{pypyprefix}/bin/pypy3.debug
|
|
|
|
rm -f %{buildroot}%{pypyprefix}/bin/libpypy3-c.so.debug
|
|
|
|
|
|
|
|
|
2011-01-03 20:06:28 +00:00
|
|
|
%check
|
|
|
|
topdir=$(pwd)
|
|
|
|
|
|
|
|
SkipTest() {
|
|
|
|
TEST_NAME=$1
|
2011-08-25 18:50:53 +00:00
|
|
|
sed -i -e"s|^$TEST_NAME$||g" testnames.txt
|
2011-01-03 20:06:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
CheckPyPy() {
|
|
|
|
# We'll be exercising one of the freshly-built binaries using the
|
|
|
|
# test suite from the standard library (overridden in places by pypy's
|
|
|
|
# modified version)
|
|
|
|
ExeName=$1
|
|
|
|
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "STARTING TEST OF: $ExeName"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
|
|
|
|
pushd %{goal_dir}
|
|
|
|
|
2011-08-19 23:04:38 +00:00
|
|
|
# I'm seeing numerous cases where tests seem to hang, or fail unpredictably
|
|
|
|
# So we'll run each test in its own process, with a timeout
|
|
|
|
|
|
|
|
# Use regrtest to explicitly list all tests:
|
|
|
|
( ./$ExeName -c \
|
2015-04-24 22:48:59 +00:00
|
|
|
"from test.regrtest import findtests; print('\n'.join(findtests()))"
|
2011-08-19 23:04:38 +00:00
|
|
|
) > testnames.txt
|
|
|
|
|
2011-08-25 15:58:55 +00:00
|
|
|
# Skip some tests:
|
|
|
|
# "audioop" doesn't exist for pypy yet:
|
|
|
|
SkipTest test_audioop
|
|
|
|
|
|
|
|
# The gdb CPython hooks haven't been ported to cpyext:
|
|
|
|
SkipTest test_gdb
|
|
|
|
|
|
|
|
# hotshot relies heavily on _hotshot, which doesn't exist:
|
|
|
|
SkipTest test_hotshot
|
|
|
|
|
|
|
|
# "strop" module doesn't exist for pypy yet:
|
|
|
|
SkipTest test_strop
|
|
|
|
|
2011-10-04 18:37:40 +00:00
|
|
|
# I'm seeing Koji builds hanging e.g.:
|
|
|
|
# http://koji.fedoraproject.org/koji/getfile?taskID=3386821&name=build.log
|
|
|
|
# The only test that seems to have timed out in that log is
|
|
|
|
# test_multiprocessing, so skip it for now:
|
|
|
|
SkipTest test_multiprocessing
|
|
|
|
|
2011-08-19 23:04:38 +00:00
|
|
|
echo "== Test names =="
|
|
|
|
cat testnames.txt
|
|
|
|
echo "================="
|
|
|
|
|
|
|
|
echo "" > failed-tests.txt
|
|
|
|
|
|
|
|
for TestName in $(cat testnames.txt) ; do
|
|
|
|
|
|
|
|
echo "===================" $TestName "===================="
|
|
|
|
|
|
|
|
# Use /usr/bin/time (rather than the shell "time" builtin) to gather
|
|
|
|
# info on the process (time/CPU/memory). This passes on the exit
|
|
|
|
# status of the underlying command
|
|
|
|
#
|
|
|
|
# Use perl's alarm command to impose a timeout
|
|
|
|
# 900 seconds is 15 minutes per test.
|
|
|
|
# If a test hangs, that test should get terminated, allowing the build
|
|
|
|
# to continue.
|
|
|
|
#
|
|
|
|
# Invoke pypy on test.regrtest to run the specific test suite
|
|
|
|
# verbosely
|
|
|
|
#
|
|
|
|
# For now, || true, so that any failures don't halt the build:
|
|
|
|
( /usr/bin/time \
|
|
|
|
perl -e 'alarm shift @ARGV; exec @ARGV' 900 \
|
|
|
|
./$ExeName -m test.regrtest -v $TestName ) \
|
|
|
|
|| (echo $TestName >> failed-tests.txt) \
|
|
|
|
|| true
|
|
|
|
done
|
|
|
|
|
|
|
|
echo "== Failed tests =="
|
|
|
|
cat failed-tests.txt
|
|
|
|
echo "================="
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
popd
|
|
|
|
|
|
|
|
# Doublecheck pypy's own test suite, using the built pypy binary:
|
|
|
|
|
|
|
|
# Disabled for now:
|
|
|
|
# x86_64 shows various failures inside:
|
|
|
|
# jit/backend/x86/test
|
|
|
|
# followed by a segfault inside
|
|
|
|
# jit/backend/x86/test/test_runner.py
|
|
|
|
#
|
|
|
|
# i686 shows various failures inside:
|
|
|
|
# jit/backend/x86/test
|
|
|
|
# with the x86_64 failure leading to cancellation of the i686 build
|
|
|
|
|
|
|
|
# Here's the disabled code:
|
|
|
|
# pushd pypy
|
|
|
|
# time translator/goal/$ExeName test_all.py
|
|
|
|
# popd
|
|
|
|
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "FINISHED TESTING: $ExeName"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
echo "--------------------------------------------------------------"
|
|
|
|
}
|
|
|
|
|
2014-01-02 09:47:41 +00:00
|
|
|
#python testrunner/runner.py --logfile=pytest-A.log --config=pypy/pytest-A.cfg --config=pypy/pytest-A.py --root=pypy --timeout=3600
|
|
|
|
#python pypy/test_all.py --pypy=pypy/goal/pypy --timeout=3600 --resultlog=cpython.log lib-python
|
|
|
|
#python pypy/test_all.py --pypy=pypy/goal/pypy --resultlog=pypyjit.log pypy/module/pypyjit/test
|
|
|
|
#pypy/goal/pypy pypy/test_all.py --resultlog=pypyjit_new.log
|
|
|
|
|
2011-08-19 23:04:38 +00:00
|
|
|
%if %{run_selftests}
|
2017-10-20 18:31:31 +00:00
|
|
|
CheckPyPy %{name}-c
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
%if 0%{with_stackless}
|
2017-10-20 18:31:31 +00:00
|
|
|
CheckPyPy %{name}-stackless
|
2011-01-03 20:06:28 +00:00
|
|
|
%endif
|
|
|
|
|
2011-08-19 23:04:38 +00:00
|
|
|
%endif # run_selftests
|
2011-01-03 20:06:28 +00:00
|
|
|
|
2015-04-27 16:35:23 +00:00
|
|
|
# Because there's a bunch of binary subpackages and creating
|
|
|
|
# /usr/share/licenses/pypy3-this and /usr/share/licenses/pypy3-that
|
|
|
|
# is just confusing for the user.
|
|
|
|
%global _docdir_fmt %{name}
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
%files libs
|
2015-04-27 16:16:19 +00:00
|
|
|
%license LICENSE
|
|
|
|
%doc README.rst
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
%dir %{pypyprefix}
|
|
|
|
%dir %{pypyprefix}/lib-python
|
|
|
|
%{pypyprefix}/lib-python/%{pylibver}/
|
|
|
|
%{pypyprefix}/lib_pypy/
|
|
|
|
%{pypyprefix}/site-packages/
|
2011-09-13 09:00:09 +00:00
|
|
|
%if %{with_emacs}
|
2016-07-08 12:38:18 +00:00
|
|
|
%{_emacs_sitelispdir}/pypy3trace-mode.el
|
|
|
|
%{_emacs_sitelispdir}/pypy3trace-mode.elc
|
2011-09-13 09:00:09 +00:00
|
|
|
%endif
|
2011-01-03 20:06:28 +00:00
|
|
|
|
|
|
|
%files
|
2015-04-27 16:16:19 +00:00
|
|
|
%license LICENSE
|
|
|
|
%doc README.rst
|
2016-07-08 12:38:18 +00:00
|
|
|
%{_bindir}/pypy3
|
2017-10-20 18:31:31 +00:00
|
|
|
%{_bindir}/pypy%{pyversion}
|
2016-07-08 12:38:18 +00:00
|
|
|
%{pypyprefix}/bin/
|
2011-01-03 20:06:28 +00:00
|
|
|
|
2016-10-22 12:11:41 +00:00
|
|
|
%exclude %{_libdir}/%{name}-%{version}.tar.bz2
|
|
|
|
|
2011-01-14 00:51:26 +00:00
|
|
|
%files devel
|
|
|
|
%dir %{pypy_include_dir}
|
|
|
|
%{pypy_include_dir}/*.h
|
2016-07-08 12:38:18 +00:00
|
|
|
%{_rpmconfigdir}/macros.d/macros.pypy3
|
2011-01-14 00:51:26 +00:00
|
|
|
|
2011-01-03 20:06:28 +00:00
|
|
|
%if 0%{with_stackless}
|
|
|
|
%files stackless
|
2015-04-27 16:16:19 +00:00
|
|
|
%license LICENSE
|
|
|
|
%doc README.rst
|
2016-07-08 12:38:18 +00:00
|
|
|
%{_bindir}/pypy-stackless
|
2011-01-03 20:06:28 +00:00
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
2018-04-14 08:55:05 +00:00
|
|
|
* Sat Apr 14 2018 Miro Hrončok <mhroncok@redhat.com> - 5.10.1-8
|
|
|
|
- Fix failing taskotron check
|
|
|
|
|
2018-04-11 22:23:12 +00:00
|
|
|
* Wed Apr 11 2018 Miro Hrončok <mhroncok@redhat.com> - 5.10.1-7
|
|
|
|
- Provide pypy3(abi) = 5.10
|
|
|
|
|
2018-04-11 10:09:36 +00:00
|
|
|
* Wed Apr 11 2018 Miro Hrončok <mhroncok@redhat.com> - 5.10.1-6
|
|
|
|
- RPM macros improvements
|
|
|
|
|
2018-04-10 23:31:31 +00:00
|
|
|
* Tue Apr 10 2018 Michal Cyprian <mcyprian@redhat.com> - 5.10.1-5
|
|
|
|
- Remove the rightmost version number from the path
|
|
|
|
- rhbz#1516885: https://bugzilla.redhat.com/show_bug.cgi?id=1516885
|
|
|
|
|
2018-03-29 19:24:14 +00:00
|
|
|
* Thu Mar 29 2018 Michal Cyprian <mcyprian@redhat.com> - 5.10.1-4
|
|
|
|
- Add patch for libxcrypt
|
|
|
|
|
2018-02-09 06:17:45 +00:00
|
|
|
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.10.1-3
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
|
|
|
2018-01-20 22:07:39 +00:00
|
|
|
* Sat Jan 20 2018 Björn Esser <besser82@fedoraproject.org> - 5.10.1-2
|
|
|
|
- Rebuilt for switch to libxcrypt
|
|
|
|
|
2018-01-12 09:01:38 +00:00
|
|
|
* Fri Jan 12 2018 Miro Hrončok <mhroncok@redhat.com> - 5.10.1-1
|
|
|
|
- Update to 5.10.1 (#1533689)
|
|
|
|
- Removed two upstreamed patches
|
|
|
|
|
2017-12-29 13:12:06 +00:00
|
|
|
* Fri Dec 29 2017 Miro Hrončok <mhroncok@redhat.com> - 5.10.0-3
|
|
|
|
- Remove never used InstallPyPy function
|
|
|
|
- Actually call execstack as originally intended
|
|
|
|
- Use execstack on all arches (it's available now)
|
|
|
|
- Don't ship the debug binaries
|
2017-12-29 18:50:56 +00:00
|
|
|
- On power, use cpython2 to build pypy3
|
2017-12-29 13:12:06 +00:00
|
|
|
|
2017-12-28 16:45:36 +00:00
|
|
|
* Thu Dec 28 2017 Miro Hrončok <mhroncok@redhat.com> - 5.10.0-2
|
|
|
|
- Fixed upstream issues #2717 and #2718 (re-enable test_socket)
|
2017-12-28 16:47:00 +00:00
|
|
|
- Use pypy2 when building (it's faster and works this time)
|
2017-12-28 16:45:36 +00:00
|
|
|
|
2017-12-26 10:56:15 +00:00
|
|
|
* Mon Dec 25 2017 Miro Hrončok <mhroncok@redhat.com> - 5.10.0-1
|
|
|
|
- Update to 5.10 (#1528841)
|
|
|
|
- Use pypy2 and python2-pycparser (note the twos)
|
2017-12-27 14:57:17 +00:00
|
|
|
- Enable JIT on power and s390x
|
2017-12-27 14:58:25 +00:00
|
|
|
- Temporarily skip test_socket on ix86
|
2017-12-26 10:56:15 +00:00
|
|
|
|
2017-10-20 18:31:31 +00:00
|
|
|
* Fri Oct 20 2017 Miro Hrončok <mhroncok@redhat.com> - 5.9.0-1
|
|
|
|
- Update to 5.9 (#1504427)
|
|
|
|
- Remove merged patches
|
|
|
|
- Reindex the patches to match the filenames
|
|
|
|
- Rebase the faulthandler Patch11
|
|
|
|
- BR python-pycparser
|
|
|
|
|
2017-08-03 06:35:52 +00:00
|
|
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.0-6
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
|
|
|
|
2017-07-27 09:23:17 +00:00
|
|
|
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.0-5
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
|
|
|
2017-02-11 08:09:09 +00:00
|
|
|
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.0-4
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
|
|
|
|
2016-11-13 08:22:11 +00:00
|
|
|
* Sun Nov 13 2016 Dan Horák <dan[at]danny.cz> - 5.5.0-3
|
|
|
|
- set z10 as the base CPU for s390(x) build
|
|
|
|
|
2016-11-12 11:51:54 +00:00
|
|
|
* Sat Nov 12 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 5.5.0-2
|
|
|
|
- Also build on arm and s390*
|
|
|
|
|
2016-10-22 12:11:41 +00:00
|
|
|
* Sat Oct 15 2016 Miro Hrončok <mhroncok@redhat.com> - 5.5.0-1
|
|
|
|
- PyPy 3.3 5.5.0
|
|
|
|
- On Fedora 26+, BR compat-openssl10-devel
|
|
|
|
|
2016-07-08 12:38:18 +00:00
|
|
|
* Sat Jul 02 2016 Miro Hrončok <mhroncok@redhat.com> - 5.2.0-0.1.alpha1
|
|
|
|
- First alpha build of PyPy 3.3
|
|
|
|
|
|
|
|
* Fri Jul 01 2016 Miro Hrončok <mhroncok@redhat.com> - 2.4.0-3
|
2016-07-01 13:59:13 +00:00
|
|
|
- Fix for: CVE-2016-0772 python: smtplib StartTLS stripping attack
|
|
|
|
- Raise an error when STARTTLS fails
|
|
|
|
- rhbz#1303647: https://bugzilla.redhat.com/show_bug.cgi?id=1303647
|
|
|
|
- rhbz#1351680: https://bugzilla.redhat.com/show_bug.cgi?id=1351680
|
|
|
|
- Fixed upstream: https://hg.python.org/cpython/rev/d590114c2394
|
|
|
|
- Fix for: CVE-2016-5699 python: http protocol steam injection attack
|
|
|
|
- rhbz#1303699: https://bugzilla.redhat.com/show_bug.cgi?id=1303699
|
|
|
|
- rhbz#1351687: https://bugzilla.redhat.com/show_bug.cgi?id=1351687
|
|
|
|
- Fixed upstream: https://hg.python.org/cpython/rev/bf3e1c9b80e9
|
|
|
|
|
2015-06-18 18:15:59 +00:00
|
|
|
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.0-2
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
|
|
|
|
2014-09-23 10:20:25 +00:00
|
|
|
* Wed Sep 10 2014 Matej Stuchlik <mstuchli@redhat.com> - 2.4.0-1
|
|
|
|
- Update to 2.4.0
|
|
|
|
|
2014-09-02 08:01:18 +00:00
|
|
|
* Tue Sep 02 2014 Matej Stuchlik <mstuchli@redhat.com> - 2.3.1-4
|
|
|
|
- Move devel subpackage requires so that it gets picked up by rpm
|
|
|
|
|
2014-08-17 20:41:57 +00:00
|
|
|
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.1-3
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
|
|
|
|
2014-07-07 22:07:38 +00:00
|
|
|
* Mon Jul 7 2014 Peter Robinson <pbrobinson@fedoraproject.org> 2.3.1-2
|
|
|
|
- ARMv7 is supported for JIT
|
|
|
|
- no prelink on aarch64/ppc64le
|
|
|
|
|
2014-06-08 18:55:40 +00:00
|
|
|
* Sun Jun 08 2014 Matej Stuchlik <mstuchli@redhat.com> - 2.3.1-1
|
|
|
|
- Update to 2.3.1
|
|
|
|
|
2014-06-07 18:12:20 +00:00
|
|
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3-5
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
|
|
|
|
2014-05-27 21:16:43 +00:00
|
|
|
* Tue May 27 2014 Dennis Gilmore <dennis@ausil.us> - 2.3-4
|
|
|
|
- valgrind is available everywhere except 31 bit s390
|
|
|
|
|
2014-05-21 10:32:28 +00:00
|
|
|
* Wed May 21 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.3-3
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Changes/f21tcl86
|
|
|
|
|
2014-05-15 10:20:24 +00:00
|
|
|
* Thu May 15 2014 Matej Stuchlik <mstuchli@redhat.com> - 2.3-2
|
|
|
|
- Rebuilt (f21-python)
|
|
|
|
|
2014-05-14 10:40:14 +00:00
|
|
|
* Tue May 13 2014 Matej Stuchlik <mstuchli@redhat.com> - 2.3-1
|
|
|
|
- Updated to 2.3
|
|
|
|
|
2014-03-10 08:17:48 +00:00
|
|
|
* Mon Mar 10 2014 Matej Stuchlik <mstuchli@redhat.com> - 2.2.1-3
|
|
|
|
- Put RPM macros in proper location
|
|
|
|
|
2014-01-17 09:46:17 +00:00
|
|
|
* Thu Jan 16 2014 Matej Stuchlik <mstuchli@redhat.com> - 2.2.1-2
|
|
|
|
- Fixed errors due to missing __pycache__
|
|
|
|
|
2014-01-02 09:47:41 +00:00
|
|
|
* Thu Dec 05 2013 Matej Stuchlik <mstuchli@redhat.com> - 2.2.1-1
|
|
|
|
- Updated to 2.2.1
|
|
|
|
- Several bundled modules (tkinter, sqlite3, curses, syslog) were
|
|
|
|
not bytecompiled properly during build, that is now fixed
|
|
|
|
- prepared new tests, not enabled yet
|
|
|
|
|
2013-11-12 09:19:28 +00:00
|
|
|
* Thu Nov 14 2013 Matej Stuchlik <mstuchli@redhat.com> - 2.2.0-1
|
|
|
|
- Updated to 2.2.0
|
|
|
|
|
2013-08-16 08:12:29 +00:00
|
|
|
* Thu Aug 15 2013 Matej Stuchlik <mstuchli@redhat.com> - 2.1-1
|
|
|
|
- Updated to 2.1.0
|
|
|
|
|
2013-08-04 06:04:23 +00:00
|
|
|
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.2-5
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
|
|
|
|
2013-06-24 08:44:06 +00:00
|
|
|
* Mon Jun 24 2013 Matej Stuchlik <mstuchli@redhat.com> - 2.0.2-4
|
|
|
|
- Patch1 fix
|
|
|
|
|
2013-06-24 08:29:01 +00:00
|
|
|
* Mon Jun 24 2013 Matej Stuchlik <mstuchli@redhat.com> - 2.0.2-3
|
|
|
|
- Yet another Sources fix
|
|
|
|
|
2013-06-24 07:24:07 +00:00
|
|
|
* Mon Jun 24 2013 Matej Stuchlik <mstuchli@redhat.com> - 2.0.2-2
|
|
|
|
- Fixed Source URL
|
|
|
|
|
2013-06-24 06:57:35 +00:00
|
|
|
* Mon Jun 24 2013 Matej Stuchlik <mstuchli@redhat.com> - 2.0.2-1
|
|
|
|
- 2.0.2, patch 8 does not seem necessary anymore
|
|
|
|
|
2013-02-14 18:48:36 +00:00
|
|
|
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0-0.2.b1
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
|
|
|
2012-12-13 11:16:11 +00:00
|
|
|
* Tue Dec 11 2012 David Malcolm <dmalcolm@redhat.com> - 2.0-0.1.b1
|
|
|
|
- 2.0b1 (drop upstreamed patch 9)
|
|
|
|
|
2012-07-21 04:22:27 +00:00
|
|
|
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9-4
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
|
|
|
2012-07-10 20:45:52 +00:00
|
|
|
* Tue Jul 10 2012 David Malcolm <dmalcolm@redhat.com> - 1.9-3
|
|
|
|
- log all output from "make" (patch 6)
|
|
|
|
- disable the MOTD at startup (patch 7)
|
|
|
|
- hide symbols from the dynamic linker (patch 8)
|
|
|
|
- add PyInt_AsUnsignedLongLongMask (patch 9)
|
|
|
|
- capture the Makefile, the typeids.txt, and the dynamic-symbols file within
|
|
|
|
the debuginfo package
|
|
|
|
|
2012-06-18 08:50:36 +00:00
|
|
|
* Mon Jun 18 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.9-2
|
|
|
|
- Compile with PIC, fixes FTBFS on ARM
|
|
|
|
|
2012-06-09 00:18:15 +00:00
|
|
|
* Fri Jun 8 2012 David Malcolm <dmalcolm@redhat.com> - 1.9-1
|
|
|
|
- 1.9
|
|
|
|
|
2012-02-10 16:12:43 +00:00
|
|
|
* Fri Feb 10 2012 David Malcolm <dmalcolm@redhat.com> - 1.8-2
|
|
|
|
- disable C readability patch for now (patch 4)
|
|
|
|
|
2012-02-10 14:19:56 +00:00
|
|
|
* Thu Feb 9 2012 David Malcolm <dmalcolm@redhat.com> - 1.8-1
|
|
|
|
- 1.8; regenerate config patch (patch 0); drop selinux patch (patch 2);
|
|
|
|
regenerate patch 5
|
|
|
|
|
2012-01-31 09:53:38 +00:00
|
|
|
* Tue Jan 31 2012 David Malcolm <dmalcolm@redhat.com> - 1.7-4
|
|
|
|
- fix an incompatibility with virtualenv (rhbz#742641)
|
|
|
|
|
2012-01-14 01:29:18 +00:00
|
|
|
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7-3
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
|
|
|
2011-12-16 22:15:41 +00:00
|
|
|
* Fri Dec 16 2011 David Malcolm <dmalcolm@redhat.com> - 1.7-2
|
|
|
|
- use --gcrootfinder=shadowstack, and use standard Fedora compilation flags,
|
|
|
|
with -Wno-unused (rhbz#666966 and rhbz#707707)
|
|
|
|
|
2011-11-22 16:30:49 +00:00
|
|
|
* Mon Nov 21 2011 David Malcolm <dmalcolm@redhat.com> - 1.7-1
|
|
|
|
- 1.7: refresh patch 0 (configuration) and patch 4 (readability of generated
|
|
|
|
code)
|
|
|
|
|
2011-10-04 18:37:40 +00:00
|
|
|
* Tue Oct 4 2011 David Malcolm <dmalcolm@redhat.com> - 1.6-7
|
|
|
|
- skip test_multiprocessing
|
|
|
|
|
2011-09-13 09:00:09 +00:00
|
|
|
* Tue Sep 13 2011 David Malcolm <dmalcolm@redhat.com> - 1.6-6
|
|
|
|
- don't ship the emacs JIT-viewer on el5 and el6 (missing emacs-filesystem;
|
|
|
|
missing _emacs_bytecompile macro on el5)
|
|
|
|
|
2011-09-13 01:01:16 +00:00
|
|
|
* Mon Sep 12 2011 David Malcolm <dmalcolm@redhat.com> - 1.6-5
|
|
|
|
- build using python26 on el5 (2.4 is too early)
|
2011-08-25 18:50:53 +00:00
|
|
|
* Thu Aug 25 2011 David Malcolm <dmalcolm@redhat.com> - 1.6-4
|
|
|
|
- fix SkipTest function to avoid corrupting the name of "test_gdbm"
|
|
|
|
|
2011-08-25 15:58:55 +00:00
|
|
|
* Thu Aug 25 2011 David Malcolm <dmalcolm@redhat.com> - 1.6-3
|
|
|
|
- add rpm macros file to the devel subpackage (source 2)
|
|
|
|
- skip some tests that can't pass yet
|
|
|
|
|
2011-08-20 15:59:48 +00:00
|
|
|
* Sat Aug 20 2011 David Malcolm <dmalcolm@redhat.com> - 1.6-2
|
|
|
|
- work around test_subprocess failure seen in koji (patch 5)
|
|
|
|
|
2011-08-19 23:04:38 +00:00
|
|
|
* Thu Aug 18 2011 David Malcolm <dmalcolm@redhat.com> - 1.6-1
|
|
|
|
- 1.6
|
|
|
|
- rewrite the %%check section, introducing per-test timeouts
|
|
|
|
|
2011-08-03 17:02:57 +00:00
|
|
|
* Tue Aug 2 2011 David Malcolm <dmalcolm@redhat.com> - 1.5-2
|
|
|
|
- add pypytrace-mode.el to the pypy-libs subpackage, for viewing JIT trace
|
|
|
|
logs in emacs
|
|
|
|
|
Rebase to 1.5 (rhbz#701121)
Update patches:
patch 0: pypy-1.4-config.patch -> pypy-1.5-config.patch
patch 4: pypy-1.4.1-more-readable-c-code.patch -> pypy-1.5-more-readable-c-code.patch
Remove references to *.inl files, no longer present
Add the following tests to the skip list:
test_audioop, test_capi, test_distutils, test_gc, test_gdb, test_generators,
test_getargs2, test_hotshot, test_io, test_multiprocessing, test_posix,
test_readline, test_scope, test_strop, test_structmembers, test_subprocess,
test_symtable, test_sys_settrace, test_tempfile, test_thread, test_uuid,
test_zipimport_support
Add a couple of text files to the payload (TODO, stdlib-version.txt)
2011-05-02 18:46:32 +00:00
|
|
|
* Mon May 2 2011 David Malcolm <dmalcolm@redhat.com> - 1.5-1
|
|
|
|
- 1.5
|
|
|
|
|
2011-04-30 22:24:07 +00:00
|
|
|
* Wed Apr 20 2011 David Malcolm <dmalcolm@redhat.com> - 1.4.1-10
|
|
|
|
- build a /usr/bin/pypy (but without the JIT compiler) on architectures that
|
|
|
|
don't support the JIT, so that they do at least have something that runs
|
|
|
|
|
2011-02-09 02:23:05 +00:00
|
|
|
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.1-9
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
|
|
|
2011-01-14 16:58:45 +00:00
|
|
|
* Fri Jan 14 2011 David Malcolm <dmalcolm@redhat.com> - 1.4.1-8
|
|
|
|
- disable self-hosting for now, due to fatal error seen JIT-compiling the
|
|
|
|
translator
|
|
|
|
|
2011-01-14 16:06:07 +00:00
|
|
|
* Fri Jan 14 2011 David Malcolm <dmalcolm@redhat.com> - 1.4.1-7
|
|
|
|
- skip test_ioctl for now
|
|
|
|
|
2011-01-14 00:51:26 +00:00
|
|
|
* Thu Jan 13 2011 David Malcolm <dmalcolm@redhat.com> - 1.4.1-6
|
|
|
|
- add a "pypy-devel" subpackage, and install the header files there
|
|
|
|
- in %%check, re-run failed tests in verbose mode
|
|
|
|
|
2011-01-07 16:56:06 +00:00
|
|
|
* Fri Jan 7 2011 Dan Horák <dan[at]danny.cz> - 1.4.1-5
|
|
|
|
- valgrind available only on selected architectures
|
|
|
|
|
2011-01-06 22:09:03 +00:00
|
|
|
* Wed Jan 5 2011 David Malcolm <dmalcolm@redhat.com> - 1.4.1-4
|
|
|
|
- rebuild pypy using itself, for speed, with a boolean to break this cycle in
|
|
|
|
the build-requirement graph (falling back to using "python-devel" aka CPython)
|
|
|
|
- add work-in-progress patch to try to make generated c more readable
|
|
|
|
(rhbz#666963)
|
|
|
|
- capture the RPython source code files from the build within the debuginfo
|
|
|
|
package (rhbz#666975)
|
|
|
|
|
2011-01-03 20:06:28 +00:00
|
|
|
* Wed Dec 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.4.1-3
|
|
|
|
- try to respect the FHS by installing libraries below libdir, rather than
|
|
|
|
datadir; patch app_main.py to look in this installation location first when
|
|
|
|
scanning for the pypy library directories.
|
|
|
|
- clarifications and corrections to the comments in the specfile
|
|
|
|
|
|
|
|
* Wed Dec 22 2010 David Malcolm <dmalcolm@redhat.com> - 1.4.1-2
|
|
|
|
- remove .svn directories
|
|
|
|
- disable verbose logging
|
|
|
|
- add a %%check section
|
|
|
|
- introduce %%goal_dir variable, to avoid repetition
|
|
|
|
- remove shebang line from demo/bpnn.py, as we're treating this as a
|
|
|
|
documentation file
|
|
|
|
- regenerate patch 2 to apply without generating a .orig file
|
|
|
|
|
|
|
|
* Tue Dec 21 2010 David Malcolm <dmalcolm@redhat.com> - 1.4.1-1
|
|
|
|
- 1.4.1; fixup %%setup to reflect change in toplevel directory in upstream
|
|
|
|
source tarball
|
|
|
|
- apply SELinux fix to the bundled test_commands.py (patch 2)
|
|
|
|
|
|
|
|
* Wed Dec 15 2010 David Malcolm <dmalcolm@redhat.com> - 1.4-4
|
|
|
|
- rename the jit build and subpackge to just "pypy", and remove the nojit and
|
|
|
|
sandbox builds, as upstream now seems to be focussing on the JIT build (with
|
|
|
|
only stackless called out in the getting-started-python docs); disable
|
|
|
|
stackless for now
|
|
|
|
- add a verbose_logs specfile boolean; leave it enabled for now (whilst fixing
|
|
|
|
build issues)
|
|
|
|
- add more comments, and update others to reflect 1.2 -> 1.4 changes
|
|
|
|
- re-enable debuginfo within CFLAGS ("-g")
|
|
|
|
- add the LICENSE and README to all subpackages
|
|
|
|
- ensure the built binaries don't have the "I need an executable stack" flag
|
|
|
|
- remove DOS batch files during %%prep (idlelib.bat)
|
|
|
|
- remove shebang lines from .py files that aren't executable, and remove
|
|
|
|
executability from .py files that don't have a shebang line (taken from
|
|
|
|
our python3.spec)
|
|
|
|
- bytecompile the .py files into .pyc files in pypy's bytecode format
|
|
|
|
|
|
|
|
* Sun Nov 28 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 1.4-3
|
|
|
|
- BuildRequire valgrind-devel
|
|
|
|
- Install pypy library from the new directory
|
|
|
|
- Disable building with our CFLAGS for now because they are causing a build failure.
|
|
|
|
- Include site-packages directory
|
|
|
|
|
|
|
|
* Sat Nov 27 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 1.4-2
|
|
|
|
- Add patch to configure the build to use our CFLAGS and link libffi
|
|
|
|
dynamically
|
|
|
|
|
|
|
|
* Sat Nov 27 2010 Toshio Kuratomi <toshio@fedoraproject.org> - 1.4-1
|
|
|
|
- Update to 1.4
|
|
|
|
- Drop patch for py2.6 that's in this build
|
|
|
|
- Switch to building pypy with itself once pypy is built once as recommended by
|
|
|
|
upstream
|
|
|
|
- Remove bundled, prebuilt java libraries
|
|
|
|
- Fix license tag
|
|
|
|
- Fix source url
|
|
|
|
- Version pypy-libs Req
|
|
|
|
|
|
|
|
* Tue May 4 2010 David Malcolm <dmalcolm@redhat.com> - 1.2-2
|
|
|
|
- cherrypick r72073 from upstream SVN in order to fix the build against
|
|
|
|
python 2.6.5 (patch 2)
|
|
|
|
|
|
|
|
* Wed Apr 28 2010 David Malcolm <dmalcolm@redhat.com> - 1.2-1
|
|
|
|
- initial packaging
|
|
|
|
|