diff --git a/189-use-rpm-wheels.patch b/189-use-rpm-wheels.patch index a379dae..5acc67c 100644 --- a/189-use-rpm-wheels.patch +++ b/189-use-rpm-wheels.patch @@ -1,5 +1,5 @@ diff --git a/lib-python/2.7/ensurepip/__init__.py b/lib-python/2.7/ensurepip/__init__.py -index c2abed8..bd1aa79 100644 +index ae01aa7..f1311be 100644 --- a/lib-python/2.7/ensurepip/__init__.py +++ b/lib-python/2.7/ensurepip/__init__.py @@ -1,9 +1,10 @@ @@ -20,9 +20,9 @@ index c2abed8..bd1aa79 100644 +_WHEEL_DIR = "/usr/share/python-wheels/" --_SETUPTOOLS_VERSION = "28.8.0" +-_SETUPTOOLS_VERSION = "41.2.0" --_PIP_VERSION = "9.0.1" +-_PIP_VERSION = "19.2.3" +def _get_most_recent_wheel_version(pkg): + prefix = os.path.join(_WHEEL_DIR, "{}-".format(pkg)) + suffix = "-py2.py3-none-any.whl" @@ -37,23 +37,7 @@ index c2abed8..bd1aa79 100644 _PROJECTS = [ ("setuptools", _SETUPTOOLS_VERSION), -@@ -28,8 +39,13 @@ def _run_pip(args, additional_paths=None): - sys.path = additional_paths + sys.path - - # Install the bundled software -- import pip -- pip.main(args) -+ try: -+ # pip 10 -+ from pip._internal import main -+ except ImportError: -+ # pip 9 -+ from pip import main -+ main(args) - - - def version(): -@@ -85,12 +101,9 @@ def bootstrap(root=None, upgrade=False, user=False, +@@ -85,12 +96,9 @@ def bootstrap(root=None, upgrade=False, user=False, additional_paths = [] for project, version in _PROJECTS: wheel_name = "{}-{}-py2.py3-none-any.whl".format(project, version) diff --git a/d81c769a235307f6671a8fa916f48d6896cbb823.patch b/d81c769a235307f6671a8fa916f48d6896cbb823.patch deleted file mode 100644 index 8debd29..0000000 --- a/d81c769a235307f6671a8fa916f48d6896cbb823.patch +++ /dev/null @@ -1,49 +0,0 @@ -# HG changeset patch -# User Armin Rigo -# Date 1571380165 -7200 -# Node ID d81c769a235307f6671a8fa916f48d6896cbb823 -# Parent f27546b858f97bfa286a891e1474579759028784 -Arguably, clarify the logic. The real motivation is a gcc bug, see issue #3086 - -diff --git a/rpython/jit/backend/aarch64/opassembler.py b/rpython/jit/backend/aarch64/opassembler.py ---- a/rpython/jit/backend/aarch64/opassembler.py -+++ b/rpython/jit/backend/aarch64/opassembler.py -@@ -808,9 +808,7 @@ - # Inline a series of STR operations, starting at 'dstaddr_loc'. - # - self.mc.gen_load_int(r.ip0.value, 0) -- i = 0 -- adjustment = 0 -- needs_adjustment = itemsize < 8 and (startbyte % 8) -+ i = dst_i = 0 - total_size = size_box.getint() - while i < total_size: - sz = itemsize -@@ -818,19 +816,19 @@ - next_group += 8 - if next_group <= total_size: - sz = 8 -+ if dst_i % 8: # unaligned? -+ self.mc.ADD_ri(dstaddr_loc.value, dstaddr_loc.value, dst_i) -+ dst_i = 0 - if sz == 8: -- if needs_adjustment: -- self.mc.ADD_ri(dstaddr_loc.value, dstaddr_loc.value, i) -- adjustment = -i -- needs_adjustment = False -- self.mc.STR_ri(r.ip0.value, dstaddr_loc.value, i + adjustment) -+ self.mc.STR_ri(r.ip0.value, dstaddr_loc.value, dst_i) - elif sz == 4: -- self.mc.STRW_ri(r.ip0.value, dstaddr_loc.value, i + adjustment) -+ self.mc.STRW_ri(r.ip0.value, dstaddr_loc.value, dst_i) - elif sz == 2: -- self.mc.STRH_ri(r.ip0.value, dstaddr_loc.value, i + adjustment) -+ self.mc.STRH_ri(r.ip0.value, dstaddr_loc.value, dst_i) - else: -- self.mc.STRB_ri(r.ip0.value, dstaddr_loc.value, i + adjustment) -+ self.mc.STRB_ri(r.ip0.value, dstaddr_loc.value, dst_i) - i += sz -+ dst_i += sz - - else: - if isinstance(size_box, ConstInt): diff --git a/pypy.spec b/pypy.spec index 7f8ec58..3938328 100644 --- a/pypy.spec +++ b/pypy.spec @@ -1,8 +1,8 @@ -%global basever 7.2 +%global basever 7.3 Name: pypy Version: %{basever}.0 %global pyversion 2.7 -Release: 3%{?dist} +Release: 1%{?dist} Summary: Python implementation with a Just-In-Time compiler # LGPL and another free license we'd need to ask spot about are present in some @@ -163,9 +163,6 @@ Patch1: 007-remove-startup-message.patch # https://fedoraproject.org/wiki/Changes/Replace_glibc_libcrypt_with_libxcrypt Patch2: 009-add-libxcrypt-support.patch -# https://bitbucket.org/pypy/pypy/issues/3086 -Patch3: d81c769a235307f6671a8fa916f48d6896cbb823.patch - # Instead of bundled wheels, use our RPM packaged wheels from # /usr/share/python-wheels # We conditionally apply this, but we use autosetup, so we use Source here @@ -800,6 +797,9 @@ CheckPyPy %{name}-c-stackless %changelog +* Sat Dec 28 2019 Miro Hrončok - 7.3.0-1 +- Update to 7.3.0 + * Wed Oct 23 2019 Miro Hrončok - 7.2.0-3 - Enable JIT on aarch64 diff --git a/sources b/sources index d5a800a..a37fc84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pypy2.7-v7.2.0-src.tar.bz2) = 8f724490f9fa06686c8e25ddd3592b260bbffae460395de4c7d29d983780ce9b8925fa87434aac6446aac2034381cc1a13074faf252f5d1ac466a252f219f1ae +SHA512 (pypy2.7-v7.3.0-src.tar.bz2) = 05f039f090d837a72012db55f23d94da3f21c7458f18bd1e8ba632489248eb6486ced07b786d05e573abf2b3def2a68d96e7e1109e6d189d8e6c303c60ee3535