Date: Monday, April 1, 2019 @ 16:46:50 Author: svenstaro Revision: 446951
archrelease: copy trunk to community-x86_64 Added: pypy/repos/community-x86_64/LICENSE (from rev 446950, pypy/trunk/LICENSE) pypy/repos/community-x86_64/PKGBUILD (from rev 446950, pypy/trunk/PKGBUILD) pypy/repos/community-x86_64/a93dfb333afe.patch (from rev 446950, pypy/trunk/a93dfb333afe.patch) Deleted: pypy/repos/community-x86_64/LICENSE pypy/repos/community-x86_64/PKGBUILD --------------------+ LICENSE | 308 +++++++++++++++++++++++++-------------------------- PKGBUILD | 113 +++++++++--------- a93dfb333afe.patch | 32 +++++ 3 files changed, 246 insertions(+), 207 deletions(-) Deleted: LICENSE =================================================================== --- LICENSE 2019-04-01 16:46:38 UTC (rev 446950) +++ LICENSE 2019-04-01 16:46:50 UTC (rev 446951) @@ -1,154 +0,0 @@ -License for files in the pypy/ directory -================================================== - -Except when otherwise stated (look for LICENSE files in directories or -information at the beginning of each file) all software and -documentation in the 'pypy' directories is licensed as follows: - - The MIT License - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, - copy, modify, merge, publish, distribute, sublicense, and/or - sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included - in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. - - -PyPy Copyright holders 2003-2010 ------------------------------------ - -Except when otherwise stated (look for LICENSE files or information at -the beginning of each file) the files in the 'pypy' directory are each -copyrighted by one or more of the following people and organizations: - - Armin Rigo - Maciej Fijalkowski - Carl Friedrich Bolz - Samuele Pedroni - Antonio Cuni - Michael Hudson - Christian Tismer - Holger Krekel - Eric van Riet Paap - Richard Emslie - Anders Chrigstrom - Amaury Forgeot d Arc - Aurelien Campeas - Anders Lehmann - Niklaus Haldimann - Seo Sanghyeon - Leonardo Santagada - Lawrence Oluyede - Jakub Gustak - Guido Wesdorp - Benjamin Peterson - Alexander Schremmer - Niko Matsakis - Ludovic Aubry - Alex Martelli - Toon Verwaest - Stephan Diehl - Adrien Di Mascio - Stefan Schwarzer - Tomek Meka - Patrick Maupin - Jacob Hallen - Laura Creighton - Bob Ippolito - Camillo Bruni - Simon Burton - Bruno Gola - Alexandre Fayolle - Marius Gedminas - Guido van Rossum - Valentino Volonghi - Adrian Kuhn - Paul deGrandis - Gerald Klix - Wanja Saatkamp - Anders Hammarquist - Oscar Nierstrasz - Eugene Oden - Lukas Renggli - Guenter Jantzen - Dinu Gherman - Bartosz Skowron - Georg Brandl - Ben Young - Jean-Paul Calderone - Nicolas Chauvat - Rocco Moretti - Michael Twomey - boria - Jared Grubb - Olivier Dormond - Stuart Williams - Jens-Uwe Mager - Justas Sadzevicius - Mikael Schönenberg - Brian Dorsey - Jonathan David Riehl - Beatrice During - Elmo Mäntynen - Andreas Friedge - Alex Gaynor - Anders Qvist - Alan McIntyre - Bert Freudenberg - - Heinrich-Heine University, Germany - Open End AB (formerly AB Strakt), Sweden - merlinux GmbH, Germany - tismerysoft GmbH, Germany - Logilab Paris, France - DFKI GmbH, Germany - Impara, Germany - Change Maker, Sweden - - -License for 'lib-python/2.5.2' and 'lib-python/2.5.2-modified' -============================================================== - -Except when otherwise stated (look for LICENSE files or -copyright/license information at the beginning of each file) the files -in the 'lib-python/2.5.2' and 'lib-python/2.5.2-modified' directories -are all copyrighted by the Python Software Foundation and licensed under -the Python Software License of which you can find a copy here: -http://www.python.org/doc/Copyright.html - -License for 'pypy/translator/jvm/src/jna.jar' -============================================= - -The file 'pypy/translator/jvm/src/jna.jar' is licensed under the GNU -Lesser General Public License of which you can find a copy here: -http://www.gnu.org/licenses/lgpl.html - -License for 'pypy/translator/jvm/src/jasmin.jar' -================================================ - -The file 'pypy/translator/jvm/src/jasmin.jar' is copyright (c) 1996-2004 Jon Meyer -and distributed with permission. The use of Jasmin by PyPy does not imply -that PyPy is endorsed by Jon Meyer nor any of Jasmin's contributors. Furthermore, -the following disclaimer applies to Jasmin: - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR -TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Copied: pypy/repos/community-x86_64/LICENSE (from rev 446950, pypy/trunk/LICENSE) =================================================================== --- LICENSE (rev 0) +++ LICENSE 2019-04-01 16:46:50 UTC (rev 446951) @@ -0,0 +1,154 @@ +License for files in the pypy/ directory +================================================== + +Except when otherwise stated (look for LICENSE files in directories or +information at the beginning of each file) all software and +documentation in the 'pypy' directories is licensed as follows: + + The MIT License + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation + files (the "Software"), to deal in the Software without + restriction, including without limitation the rights to use, + copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + +PyPy Copyright holders 2003-2010 +----------------------------------- + +Except when otherwise stated (look for LICENSE files or information at +the beginning of each file) the files in the 'pypy' directory are each +copyrighted by one or more of the following people and organizations: + + Armin Rigo + Maciej Fijalkowski + Carl Friedrich Bolz + Samuele Pedroni + Antonio Cuni + Michael Hudson + Christian Tismer + Holger Krekel + Eric van Riet Paap + Richard Emslie + Anders Chrigstrom + Amaury Forgeot d Arc + Aurelien Campeas + Anders Lehmann + Niklaus Haldimann + Seo Sanghyeon + Leonardo Santagada + Lawrence Oluyede + Jakub Gustak + Guido Wesdorp + Benjamin Peterson + Alexander Schremmer + Niko Matsakis + Ludovic Aubry + Alex Martelli + Toon Verwaest + Stephan Diehl + Adrien Di Mascio + Stefan Schwarzer + Tomek Meka + Patrick Maupin + Jacob Hallen + Laura Creighton + Bob Ippolito + Camillo Bruni + Simon Burton + Bruno Gola + Alexandre Fayolle + Marius Gedminas + Guido van Rossum + Valentino Volonghi + Adrian Kuhn + Paul deGrandis + Gerald Klix + Wanja Saatkamp + Anders Hammarquist + Oscar Nierstrasz + Eugene Oden + Lukas Renggli + Guenter Jantzen + Dinu Gherman + Bartosz Skowron + Georg Brandl + Ben Young + Jean-Paul Calderone + Nicolas Chauvat + Rocco Moretti + Michael Twomey + boria + Jared Grubb + Olivier Dormond + Stuart Williams + Jens-Uwe Mager + Justas Sadzevicius + Mikael Schönenberg + Brian Dorsey + Jonathan David Riehl + Beatrice During + Elmo Mäntynen + Andreas Friedge + Alex Gaynor + Anders Qvist + Alan McIntyre + Bert Freudenberg + + Heinrich-Heine University, Germany + Open End AB (formerly AB Strakt), Sweden + merlinux GmbH, Germany + tismerysoft GmbH, Germany + Logilab Paris, France + DFKI GmbH, Germany + Impara, Germany + Change Maker, Sweden + + +License for 'lib-python/2.5.2' and 'lib-python/2.5.2-modified' +============================================================== + +Except when otherwise stated (look for LICENSE files or +copyright/license information at the beginning of each file) the files +in the 'lib-python/2.5.2' and 'lib-python/2.5.2-modified' directories +are all copyrighted by the Python Software Foundation and licensed under +the Python Software License of which you can find a copy here: +http://www.python.org/doc/Copyright.html + +License for 'pypy/translator/jvm/src/jna.jar' +============================================= + +The file 'pypy/translator/jvm/src/jna.jar' is licensed under the GNU +Lesser General Public License of which you can find a copy here: +http://www.gnu.org/licenses/lgpl.html + +License for 'pypy/translator/jvm/src/jasmin.jar' +================================================ + +The file 'pypy/translator/jvm/src/jasmin.jar' is copyright (c) 1996-2004 Jon Meyer +and distributed with permission. The use of Jasmin by PyPy does not imply +that PyPy is endorsed by Jon Meyer nor any of Jasmin's contributors. Furthermore, +the following disclaimer applies to Jasmin: + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR +TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Deleted: PKGBUILD =================================================================== --- PKGBUILD 2019-04-01 16:46:38 UTC (rev 446950) +++ PKGBUILD 2019-04-01 16:46:50 UTC (rev 446951) @@ -1,53 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: William Giokas <1007...@gmail.com> - -pkgname=pypy -pkgver=7.1.0 -pkgrel=2 -pkgdesc="A Python implementation written in Python, JIT enabled" -url="https://pypy.org" -arch=('x86_64') -depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib' 'ncurses') -makedepends=('python2' 'tk' 'sqlite' 'mercurial' 'python2-pycparser') -optdepends=('sqlite: sqlite module' - 'tk: tk module') -options=(!buildflags) -license=('MIT') -source=("https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v${pkgver}-src.tar.bz2") -sha512sums=('fa7c1a6669686dbd9c0da627dc2a06ad696f20274218af9602f91d73f3ebe0ede380c6e1a50534f53dee8f075eaef5a403c7c5b5bdbfff25e679ba30522391bb') - -build() { - cd pypy2.7-v${pkgver}-src/pypy/goal - - python2 ../../rpython/bin/rpython -Ojit --shared targetpypystandalone - - # Compile binary modules - PYTHONPATH=../.. ./pypy-c ../tool/build_cffi_imports.py -} - -package() { - cd pypy2.7-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/pypy "${pkgdir}"/opt/pypy/bin/pypy - install -Dm755 pypy/bin/libpypy-c.so "${pkgdir}"/opt/pypy/bin/libpypy-c.so - cp -r pypy/include pypy/lib_pypy pypy/lib-python pypy/site-packages "${pkgdir}"/opt/pypy/ - cd .. - - # Install symlink - mkdir -p "${pkgdir}"/usr/bin "${pkgdir}"/usr/lib - ln -s /opt/pypy/bin/pypy "${pkgdir}"/usr/bin/pypy - ln -s /opt/pypy/bin/libpypy-c.so "${pkgdir}"/usr/lib/libpypy-c.so - - # Install misc stuff - install -Dm644 README.rst "${pkgdir}"/opt/pypy/README.rst - install -Dm644 LICENSE "${pkgdir}"/opt/pypy/LICENSE - install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/pypy/LICENSE -} -# vim: ts=2 sw=2 et: Copied: pypy/repos/community-x86_64/PKGBUILD (from rev 446950, pypy/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2019-04-01 16:46:50 UTC (rev 446951) @@ -0,0 +1,60 @@ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: William Giokas <1007...@gmail.com> + +pkgname=pypy +pkgver=7.1.0 +pkgrel=3 +pkgdesc="A Python implementation written in Python, JIT enabled" +url="https://pypy.org" +arch=('x86_64') +depends=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib' 'ncurses') +makedepends=('python2' 'tk' 'sqlite' 'mercurial' 'python2-pycparser') +optdepends=('sqlite: sqlite module' + 'tk: tk module') +options=(!buildflags) +license=('MIT') +source=("https://bitbucket.org/pypy/pypy/downloads/pypy2.7-v${pkgver}-src.tar.bz2" + a93dfb333afe.patch) +sha512sums=('fa7c1a6669686dbd9c0da627dc2a06ad696f20274218af9602f91d73f3ebe0ede380c6e1a50534f53dee8f075eaef5a403c7c5b5bdbfff25e679ba30522391bb' + 'ed69a8ca9e407f5985c5ffad9649656c69a62a51c610df2718723d6460775e16d37cb888e8cb8ff2ec57ea6a8b2bd518a9368eb8421b435594efc6b32d1f5e19') + +prepare() { + cd pypy2.7-v${pkgver}-src + patch -Np1 -i ${srcdir}/a93dfb333afe.patch +} + +build() { + cd pypy2.7-v${pkgver}-src/pypy/goal + + python2 ../../rpython/bin/rpython -Ojit --shared targetpypystandalone + + # Compile binary modules + PYTHONPATH=../.. ./pypy-c ../tool/build_cffi_imports.py +} + +package() { + cd pypy2.7-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/pypy "${pkgdir}"/opt/pypy/bin/pypy + install -Dm755 pypy/bin/libpypy-c.so "${pkgdir}"/opt/pypy/bin/libpypy-c.so + cp -r pypy/include pypy/lib_pypy pypy/lib-python pypy/site-packages "${pkgdir}"/opt/pypy/ + cd .. + + # Install symlink + mkdir -p "${pkgdir}"/usr/bin "${pkgdir}"/usr/lib + ln -s /opt/pypy/bin/pypy "${pkgdir}"/usr/bin/pypy + ln -s /opt/pypy/bin/libpypy-c.so "${pkgdir}"/usr/lib/libpypy-c.so + + # Install misc stuff + install -Dm644 README.rst "${pkgdir}"/opt/pypy/README.rst + install -Dm644 LICENSE "${pkgdir}"/opt/pypy/LICENSE + install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/pypy/LICENSE +} +# vim: ts=2 sw=2 et: Copied: pypy/repos/community-x86_64/a93dfb333afe.patch (from rev 446950, pypy/trunk/a93dfb333afe.patch) =================================================================== --- a93dfb333afe.patch (rev 0) +++ a93dfb333afe.patch 2019-04-01 16:46:50 UTC (rev 446951) @@ -0,0 +1,32 @@ +# HG changeset patch +# User Matti Picus <matti.pi...@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":