[arch-commits] Commit in pypy3/repos/community-x86_64 (3 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Mon Apr 1 16:25:16 UTC 2019
Date: Monday, April 1, 2019 @ 16:25:16
Author: svenstaro
Revision: 446948
archrelease: copy trunk to community-x86_64
Added:
pypy3/repos/community-x86_64/PKGBUILD
(from rev 446947, pypy3/trunk/PKGBUILD)
pypy3/repos/community-x86_64/a93dfb333afe.patch
(from rev 446947, pypy3/trunk/a93dfb333afe.patch)
Deleted:
pypy3/repos/community-x86_64/PKGBUILD
--------------------+
PKGBUILD | 111 +++++++++++++++++++++++++++------------------------
a93dfb333afe.patch | 32 ++++++++++++++
2 files changed, 91 insertions(+), 52 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-04-01 16:25:08 UTC (rev 446947)
+++ PKGBUILD 2019-04-01 16:25:16 UTC (rev 446948)
@@ -1,52 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-
-pkgname=pypy3
-pkgver=7.1.0
-pkgrel=1
-pkgdesc="A Python3 implementation written in Python, JIT enabled"
-url="https://pypy.org"
-arch=('x86_64')
-depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib' 'ncurses')
-makedepends=('python2' 'sqlite' 'tk' 'python2-pycparser')
-optdepends=('sqlite: sqlite module'
- 'tk: tk module')
-options=(!buildflags)
-license=('MIT')
-source=("https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v${pkgver}-src.tar.bz2")
-sha512sums=('ec39c33000606aa62de8ef1b7c83ba895c95f4636d5b1026fc3727ee3b04f2de9693b5ba6b84572348c62ff33c1d4bf5ef9c01427bd54f3db057959035ec068d')
-
-build() {
- cd pypy3.6-v${pkgver}-src/pypy/goal
-
- python2 ../../rpython/bin/rpython -Ojit --shared targetpypystandalone
-
- # Compile binary modules
- PYTHONPATH=../.. ./pypy3-c ../tool/build_cffi_imports.py
-}
-
-package() {
- cd pypy3.6-v${pkgver}-src
-
- # Prepare installation
- python2 pypy/tool/release/package.py --archive-name pypy --targetdir .
- mkdir unpacked
- tar xf pypy.tar.bz2 -C unpacked
-
- # Install pypy
- cd unpacked
- install -Dm755 pypy/bin/pypy3 "${pkgdir}"/opt/pypy3/bin/pypy3
- install -Dm755 pypy/bin/libpypy3-c.so "${pkgdir}"/opt/pypy3/bin/libpypy3-c.so
- cp -r pypy/include pypy/lib_pypy pypy/lib-python pypy/site-packages "${pkgdir}"/opt/pypy3
- cd ..
-
- # Install symlinks
- mkdir -p "${pkgdir}"/usr/bin "${pkgdir}"/usr/lib
- ln -s /opt/pypy3/bin/pypy3 "${pkgdir}"/usr/bin/pypy3
- ln -s /opt/pypy3/bin/libpypy3-c.so "${pkgdir}"/usr/lib/libpypy3-c.so
-
- # Install misc stuff
- install -Dm644 README.rst "${pkgdir}"/opt/pypy3/README.rst
- install -Dm644 LICENSE "${pkgdir}"/opt/pypy3/LICENSE
- install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/pypy3/LICENSE
-}
-# vim: ts=2 sw=2 et:
Copied: pypy3/repos/community-x86_64/PKGBUILD (from rev 446947, pypy3/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-04-01 16:25:16 UTC (rev 446948)
@@ -0,0 +1,59 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+
+pkgname=pypy3
+pkgver=7.1.0
+pkgrel=2
+pkgdesc="A Python3 implementation written in Python, JIT enabled"
+url="https://pypy.org"
+arch=('x86_64')
+depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib' 'ncurses')
+makedepends=('python2' 'sqlite' 'tk' 'python2-pycparser')
+optdepends=('sqlite: sqlite module'
+ 'tk: tk module')
+options=(!buildflags)
+license=('MIT')
+source=("https://bitbucket.org/pypy/pypy/downloads/pypy3.6-v${pkgver}-src.tar.bz2"
+ a93dfb333afe.patch)
+sha512sums=('1a0a9e9de31c63114c0537747c4a718504a28b780a2ef1f76bff6051a1ec68b496b574989f0b729c07611cd81e199135dd268834dfa6f9664e1e119db8ae20e4'
+ 'ed69a8ca9e407f5985c5ffad9649656c69a62a51c610df2718723d6460775e16d37cb888e8cb8ff2ec57ea6a8b2bd518a9368eb8421b435594efc6b32d1f5e19')
+
+prepare() {
+ cd pypy3.6-v${pkgver}-src
+ patch -Np1 -i ${srcdir}/a93dfb333afe.patch
+}
+
+build() {
+ cd pypy3.6-v${pkgver}-src/pypy/goal
+
+ python2 ../../rpython/bin/rpython -Ojit --shared targetpypystandalone
+
+ # Compile binary modules
+ PYTHONPATH=../.. ./pypy3-c ../tool/build_cffi_imports.py
+}
+
+package() {
+ cd pypy3.6-v${pkgver}-src
+
+ # Prepare installation
+ python2 pypy/tool/release/package.py --archive-name pypy --targetdir .
+ mkdir unpacked
+ tar xf pypy.tar.bz2 -C unpacked
+
+ # Install pypy
+ cd unpacked
+ install -Dm755 pypy/bin/pypy3 "${pkgdir}"/opt/pypy3/bin/pypy3
+ install -Dm755 pypy/bin/libpypy3-c.so "${pkgdir}"/opt/pypy3/bin/libpypy3-c.so
+ cp -r pypy/include pypy/lib_pypy pypy/lib-python pypy/site-packages "${pkgdir}"/opt/pypy3
+ cd ..
+
+ # Install symlinks
+ mkdir -p "${pkgdir}"/usr/bin "${pkgdir}"/usr/lib
+ ln -s /opt/pypy3/bin/pypy3 "${pkgdir}"/usr/bin/pypy3
+ ln -s /opt/pypy3/bin/libpypy3-c.so "${pkgdir}"/usr/lib/libpypy3-c.so
+
+ # Install misc stuff
+ install -Dm644 README.rst "${pkgdir}"/opt/pypy3/README.rst
+ install -Dm644 LICENSE "${pkgdir}"/opt/pypy3/LICENSE
+ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/pypy3/LICENSE
+}
+# vim: ts=2 sw=2 et:
Copied: pypy3/repos/community-x86_64/a93dfb333afe.patch (from rev 446947, pypy3/trunk/a93dfb333afe.patch)
===================================================================
--- a93dfb333afe.patch (rev 0)
+++ a93dfb333afe.patch 2019-04-01 16:25:16 UTC (rev 446948)
@@ -0,0 +1,32 @@
+# HG changeset patch
+# User Matti Picus <matti.picus at gmail.com>
+# Date 1554034536 -10800
+# Node ID a93dfb333afe34ac02b15e997749cd3902ed96c0
+# Parent 9f383b2e30c6ac084fe95fd781abfc2fceffdc9f
+preserve order on extra effects (sets are not ordered on cpython2)
+
+diff --git a/rpython/jit/codewriter/effectinfo.py b/rpython/jit/codewriter/effectinfo.py
+--- a/rpython/jit/codewriter/effectinfo.py
++++ b/rpython/jit/codewriter/effectinfo.py
+@@ -326,14 +326,17 @@
+ # a read or a write to an interiorfield, inside an array of
+ # structs, is additionally recorded as a read or write of
+ # the array itself
+- extraef = set()
++ extraef = list()
+ for tup in effects:
+ if tup[0] == "interiorfield" or tup[0] == "readinteriorfield":
+ T = deref(tup[1])
+ if isinstance(T, lltype.Array) and consider_array(T):
+- extraef.add((tup[0].replace("interiorfield", "array"),
+- tup[1]))
+- effects |= extraef
++ val = (tup[0].replace("interiorfield", "array"),
++ tup[1])
++ if val not in effects:
++ extraef.append(val)
++ # preserve order in the added effects issue bitbucket #2984
++ effects = tuple(effects) + tuple(extraef)
+
+ for tup in effects:
+ if tup[0] == "struct":
More information about the arch-commits
mailing list