[arch-commits] Commit in pypy3/repos/community-x86_64 (4 files)
Sven-Hendrik Haase
svenstaro at gemini.archlinux.org
Wed Aug 10 22:07:59 UTC 2022
Date: Wednesday, August 10, 2022 @ 22:07:58
Author: svenstaro
Revision: 1265132
archrelease: copy trunk to community-x86_64
Added:
pypy3/repos/community-x86_64/PKGBUILD
(from rev 1265131, pypy3/trunk/PKGBUILD)
pypy3/repos/community-x86_64/a93dfb333afe.patch
(from rev 1265131, pypy3/trunk/a93dfb333afe.patch)
Deleted:
pypy3/repos/community-x86_64/PKGBUILD
pypy3/repos/community-x86_64/a93dfb333afe.patch
--------------------+
PKGBUILD | 103 +++++++++++++++++++++++++--------------------------
a93dfb333afe.patch | 64 +++++++++++++++----------------
2 files changed, 84 insertions(+), 83 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-08-10 22:07:33 UTC (rev 1265131)
+++ PKGBUILD 2022-08-10 22:07:58 UTC (rev 1265132)
@@ -1,51 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at archlinux.org>
-
-pkgname=pypy3
-pkgver=7.3.9
-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=('pypy' 'sqlite' 'tk')
-optdepends=('sqlite: sqlite module'
- 'tk: tk module')
-options=(!buildflags)
-license=('MIT')
-source=("https://downloads.python.org/pypy/pypy3.8-v${pkgver}-src.zip")
-sha512sums=('f9e37f29a3292eb0803bf72e04937590b52bf08fbb03005cb72eb2fb6b18b6630e6067c795bb9f75db2287e74722ef0a8b747c853cba79e860f6bd4611c547af')
-
-build() {
- cd pypy3.8-v${pkgver}-src/pypy/goal
-
- # For some reason, PyPy wants to use their vendored dependencies when detecting linux.
- # Weird, we'll patch it out.
- sed -i "s/, 'linux', 'linux2'//" targetpypystandalone.py
- pypy ../../rpython/bin/rpython -Ojit --shared targetpypystandalone
-
- # Compile binary modules
- PYTHONPATH=../.. ./pypy3-c ../../lib_pypy/pypy_tools/build_cffi_imports.py
-}
-
-package() {
- cd pypy3.8-v${pkgver}-src
-
- # Prepare installation
- pypy pypy/tool/release/package.py --archive-name pypy --targetdir .
- mkdir unpacked
- tar xf pypy.tar.bz2 -C unpacked
-
- # Install pypy
- mkdir -p "${pkgdir}"/usr/bin "${pkgdir}"/usr/lib "${pkgdir}"/opt/pypy3
- cp -r unpacked/pypy/* "${pkgdir}"/opt/pypy3
-
- # Install symlinks
- 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 1265131, pypy3/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-08-10 22:07:58 UTC (rev 1265132)
@@ -0,0 +1,52 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at archlinux.org>
+
+pkgname=pypy3
+_pyversion=3.9
+pkgver=7.3.9
+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=('pypy' 'sqlite' 'tk')
+optdepends=('sqlite: sqlite module'
+ 'tk: tk module')
+options=(!buildflags)
+license=('MIT')
+source=("https://downloads.python.org/pypy/pypy${_pyversion}-v${pkgver}-src.zip")
+sha512sums=('b08e8a6436be18ec26f654029d03883d3a7f5e0ba4f8c091503c5a33ec146f02dda757ef27d6cb92264b2ac80625d8dbe7f20278225a468ecb5f3e97fae7dc82')
+
+build() {
+ cd pypy${_pyversion}-v${pkgver}-src/pypy/goal
+
+ # For some reason, PyPy wants to use their vendored dependencies when detecting linux.
+ # Weird, we'll patch it out.
+ sed -i "s/, 'linux', 'linux2'//" targetpypystandalone.py
+ pypy ../../rpython/bin/rpython -Ojit --shared targetpypystandalone
+
+ # Compile binary modules
+ PYTHONPATH=../.. ./pypy3.9-c ../../lib_pypy/pypy_tools/build_cffi_imports.py
+}
+
+package() {
+ cd pypy${_pyversion}-v${pkgver}-src
+
+ # Prepare installation
+ pypy pypy/tool/release/package.py --archive-name pypy --targetdir .
+ mkdir unpacked
+ tar xf pypy.tar.bz2 -C unpacked
+
+ # Install pypy
+ mkdir -p "${pkgdir}"/usr/bin "${pkgdir}"/usr/lib "${pkgdir}"/opt/pypy3
+ cp -r unpacked/pypy/* "${pkgdir}"/opt/pypy3
+
+ # Install symlinks
+ 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:
Deleted: a93dfb333afe.patch
===================================================================
--- a93dfb333afe.patch 2022-08-10 22:07:33 UTC (rev 1265131)
+++ a93dfb333afe.patch 2022-08-10 22:07:58 UTC (rev 1265132)
@@ -1,32 +0,0 @@
-# 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":
Copied: pypy3/repos/community-x86_64/a93dfb333afe.patch (from rev 1265131, pypy3/trunk/a93dfb333afe.patch)
===================================================================
--- a93dfb333afe.patch (rev 0)
+++ a93dfb333afe.patch 2022-08-10 22:07:58 UTC (rev 1265132)
@@ -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