[arch-commits] Commit in python/repos/testing-x86_64 (4 files)
Felix Yan
felixonmars at gemini.archlinux.org
Sat Dec 11 18:19:56 UTC 2021
Date: Saturday, December 11, 2021 @ 18:19:56
Author: felixonmars
Revision: 431888
archrelease: copy trunk to testing-x86_64
Added:
python/repos/testing-x86_64/PKGBUILD
(from rev 431887, python/trunk/PKGBUILD)
python/repos/testing-x86_64/genrebuild
(from rev 431887, python/trunk/genrebuild)
Deleted:
python/repos/testing-x86_64/PKGBUILD
python/repos/testing-x86_64/genrebuild
------------+
PKGBUILD | 303 +++++++++++++++++++++++++++++------------------------------
genrebuild | 24 ++--
2 files changed, 166 insertions(+), 161 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-11 18:19:46 UTC (rev 431887)
+++ PKGBUILD 2021-12-11 18:19:56 UTC (rev 431888)
@@ -1,149 +0,0 @@
-# Maintainer: Angel Velasquez <angvp at archlinux.org>
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
-# Contributor: Allan McRae <allan at archlinux.org>
-# Contributor: Jason Chu <jason at archlinux.org>
-
-shopt -s extglob
-
-pkgbase=python
-pkgname=(python python-tests)
-pkgver=3.10.0
-pkgrel=1
-_pybasever=${pkgver%.*}
-pkgdesc="Next generation of the python high-level scripting language"
-arch=('x86_64')
-license=('custom')
-url="https://www.python.org/"
-depends=('bzip2' 'expat' 'gdbm' 'libffi' 'libnsl' 'libxcrypt' 'openssl' 'zlib')
-makedepends=('tk' 'sqlite' 'bluez-libs' 'mpdecimal' 'llvm' 'gdb' 'xorg-server-xvfb' 'ttf-font')
-source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz"{,.asc})
-sha512sums=('82b2729afc7d72a80882f199970667dce7d971a2e5ecfe6cf84f7b68612ab2caf6ed6d7a8cb81f24ea85cb0816464bb2e8b2e6884eda62fa40742edc674193bd'
- 'SKIP')
-validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D' # Ned Deily (Python release signing key) <nad at python.org>
- 'E3FF2839C048B25C084DEBE9B26995E310250568' # Łukasz Langa (GPG langa.pl) <lukasz at langa.pl>
- 'A035C8C19219BA821ECEA86B64E628F8D684696D') # Pablo Galindo Salgado <pablogsal at gmail.com>
-
-prepare() {
- cd Python-${pkgver}
-
- # FS#23997
- sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
-
- # Speed up LTO
- sed -i -e "s|-flto |-flto=4 |g" configure configure.ac
-
- # Ensure that we are using the system copy of various libraries (expat, libffi, and libmpdec),
- # rather than copies shipped in the tarball
- rm -r Modules/expat
- rm -r Modules/_ctypes/{darwin,libffi}*
- rm -r Modules/_decimal/libmpdec
-}
-
-build() {
- cd Python-${pkgver}
-
- # PGO should be done with -O3
- CFLAGS="${CFLAGS/-O2/-O3}"
-
- # Disable bundled pip & setuptools
- ./configure --prefix=/usr \
- --enable-shared \
- --with-computed-gotos \
- --enable-optimizations \
- --with-lto \
- --enable-ipv6 \
- --with-system-expat \
- --with-dbmliborder=gdbm:ndbm \
- --with-system-ffi \
- --with-system-libmpdec \
- --enable-loadable-sqlite-extensions \
- --without-ensurepip \
- --with-tzpath=/usr/share/zoneinfo
-
- # Obtain next free server number for xvfb-run; this even works in a chroot environment.
- export servernum=99
- while ! xvfb-run -a -n "$servernum" /bin/true 2>/dev/null; do servernum=$((servernum+1)); done
-
- LC_CTYPE=en_US.UTF-8 xvfb-run -s "-screen 0 1920x1080x16 -ac +extension GLX" -a -n "$servernum" make EXTRA_CFLAGS="$CFLAGS"
-}
-
-check() {
- # test_socket: test.test_socket.RDSTest.testPeek hangs https://bugs.python.org/issue35247
- # test_tk: tkinter.test.test_tkinter.test_colorchooser.DefaultRootTest hangs
- # test_ttk_guionly: test failures about "AssertionError: TclError not raised"
-
- cd Python-${pkgver}
-
- # Obtain next free server number for xvfb-run; this even works in a chroot environment.
- export servernum=99
- while ! xvfb-run -a -n "$servernum" /bin/true 2>/dev/null; do servernum=$((servernum+1)); done
-
- LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
- LC_CTYPE=en_US.UTF-8 xvfb-run -s "-screen 0 1920x1080x16 -ac +extension GLX" -a -n "$servernum" \
- "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x test_socket -x test_tk -x test_ttk_guionly
-}
-
-package_python() {
- optdepends=('python-setuptools'
- 'python-pip'
- 'sqlite'
- 'mpdecimal: for decimal'
- 'xz: for lzma'
- 'tk: for tkinter')
- provides=('python3')
- replaces=('python3')
-
- cd Python-${pkgver}
-
- # Hack to avoid building again
- sed -i 's/^all:.*$/all: build_all/' Makefile
-
- # PGO should be done with -O3
- CFLAGS="${CFLAGS/-O2/-O3}"
-
- make DESTDIR="${pkgdir}" EXTRA_CFLAGS="$CFLAGS" install
-
- # Split tests
- rm -r "$pkgdir"/usr/lib/python*/{test,ctypes/test,distutils/tests,idlelib/idle_test,lib2to3/tests,sqlite3/test,tkinter/test,unittest/test}
-
- # Why are these not done by default...
- ln -s python3 "${pkgdir}"/usr/bin/python
- ln -s python3-config "${pkgdir}"/usr/bin/python-config
- ln -s idle3 "${pkgdir}"/usr/bin/idle
- ln -s pydoc3 "${pkgdir}"/usr/bin/pydoc
- ln -s python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python.1
-
- # some useful "stuff" FS#46146
- install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
- install -m755 Tools/i18n/{msgfmt,pygettext}.py "${pkgdir}"/usr/lib/python${_pybasever}/Tools/i18n/
- install -m755 Tools/scripts/{README,*py} "${pkgdir}"/usr/lib/python${_pybasever}/Tools/scripts/
-
- # License
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-package_python-tests() {
- pkgdesc="Regression tests packages for Python"
- depends=('python')
-
- cd Python-${pkgver}
-
- make DESTDIR="${pkgdir}" EXTRA_CFLAGS="$CFLAGS" libinstall
- cd "$pkgdir"/usr/lib/python*/
- rm -r !(test|ctypes|distutils|idlelib|lib2to3|sqlite3|tkinter|unittest)
- cd "$pkgdir"/usr/lib/python*/ctypes
- rm -r !(test)
- cd "$pkgdir"/usr/lib/python*/distutils
- rm -r !(tests)
- cd "$pkgdir"/usr/lib/python*/idlelib
- rm -r !(idle_test)
- cd "$pkgdir"/usr/lib/python*/lib2to3
- rm -r !(tests)
- cd "$pkgdir"/usr/lib/python*/sqlite3
- rm -r !(test)
- cd "$pkgdir"/usr/lib/python*/tkinter
- rm -r !(test)
- cd "$pkgdir"/usr/lib/python*/unittest
- rm -r !(test)
-}
Copied: python/repos/testing-x86_64/PKGBUILD (from rev 431887, python/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-11 18:19:56 UTC (rev 431888)
@@ -0,0 +1,154 @@
+# Maintainer: Angel Velasquez <angvp at archlinux.org>
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Allan McRae <allan at archlinux.org>
+# Contributor: Jason Chu <jason at archlinux.org>
+
+shopt -s extglob
+
+pkgbase=python
+pkgname=(python python-tests)
+pkgver=3.10.1
+pkgrel=1
+_pybasever=${pkgver%.*}
+pkgdesc="Next generation of the python high-level scripting language"
+arch=('x86_64')
+license=('custom')
+url="https://www.python.org/"
+depends=('bzip2' 'expat' 'gdbm' 'libffi' 'libnsl' 'libxcrypt' 'openssl' 'zlib')
+makedepends=('tk' 'sqlite' 'bluez-libs' 'mpdecimal' 'llvm' 'gdb' 'xorg-server-xvfb' 'ttf-font')
+source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz"{,.asc}
+ https://bugs.python.org/file50485/cmp_interned_strings.patch)
+sha512sums=('1c559e33f1252e51bafb941c380de16f142c0735858363c84cb8dbed6767843de3af126889c2826ffb94bd4777d7cdfc31040301c8c74de56af52b80b1aa9e76'
+ 'SKIP'
+ 'd97fe57566169bfc06713d4aa420e1c85c0b9c1d0f96d61cdd3a4a86b2340753a80c56e0d48c16b513e3f639cee83b7fbbc0c21045d2f37bf37543048f914557')
+validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D' # Ned Deily (Python release signing key) <nad at python.org>
+ 'E3FF2839C048B25C084DEBE9B26995E310250568' # Łukasz Langa (GPG langa.pl) <lukasz at langa.pl>
+ 'A035C8C19219BA821ECEA86B64E628F8D684696D') # Pablo Galindo Salgado <pablogsal at gmail.com>
+
+prepare() {
+ cd Python-${pkgver}
+
+ # FS#72979
+ patch -Np1 -i ../cmp_interned_strings.patch
+
+ # FS#23997
+ sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
+
+ # Speed up LTO
+ sed -i -e "s|-flto |-flto=4 |g" configure configure.ac
+
+ # Ensure that we are using the system copy of various libraries (expat, libffi, and libmpdec),
+ # rather than copies shipped in the tarball
+ rm -r Modules/expat
+ rm -r Modules/_ctypes/{darwin,libffi}*
+ rm -r Modules/_decimal/libmpdec
+}
+
+build() {
+ cd Python-${pkgver}
+
+ # PGO should be done with -O3
+ CFLAGS="${CFLAGS/-O2/-O3}"
+
+ # Disable bundled pip & setuptools
+ ./configure --prefix=/usr \
+ --enable-shared \
+ --with-computed-gotos \
+ --enable-optimizations \
+ --with-lto \
+ --enable-ipv6 \
+ --with-system-expat \
+ --with-dbmliborder=gdbm:ndbm \
+ --with-system-ffi \
+ --with-system-libmpdec \
+ --enable-loadable-sqlite-extensions \
+ --without-ensurepip \
+ --with-tzpath=/usr/share/zoneinfo
+
+ # Obtain next free server number for xvfb-run; this even works in a chroot environment.
+ export servernum=99
+ while ! xvfb-run -a -n "$servernum" /bin/true 2>/dev/null; do servernum=$((servernum+1)); done
+
+ LC_CTYPE=en_US.UTF-8 xvfb-run -s "-screen 0 1920x1080x16 -ac +extension GLX" -a -n "$servernum" make EXTRA_CFLAGS="$CFLAGS"
+}
+
+check() {
+ # test_socket: test.test_socket.RDSTest.testPeek hangs https://bugs.python.org/issue35247
+ # test_tk: tkinter.test.test_tkinter.test_colorchooser.DefaultRootTest hangs
+ # test_ttk_guionly: test failures about "AssertionError: TclError not raised"
+
+ cd Python-${pkgver}
+
+ # Obtain next free server number for xvfb-run; this even works in a chroot environment.
+ export servernum=99
+ while ! xvfb-run -a -n "$servernum" /bin/true 2>/dev/null; do servernum=$((servernum+1)); done
+
+ LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
+ LC_CTYPE=en_US.UTF-8 xvfb-run -s "-screen 0 1920x1080x16 -ac +extension GLX" -a -n "$servernum" \
+ "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x test_socket -x test_tk -x test_ttk_guionly
+}
+
+package_python() {
+ optdepends=('python-setuptools'
+ 'python-pip'
+ 'sqlite'
+ 'mpdecimal: for decimal'
+ 'xz: for lzma'
+ 'tk: for tkinter')
+ provides=('python3')
+ replaces=('python3')
+
+ cd Python-${pkgver}
+
+ # Hack to avoid building again
+ sed -i 's/^all:.*$/all: build_all/' Makefile
+
+ # PGO should be done with -O3
+ CFLAGS="${CFLAGS/-O2/-O3}"
+
+ make DESTDIR="${pkgdir}" EXTRA_CFLAGS="$CFLAGS" install
+
+ # Split tests
+ rm -r "$pkgdir"/usr/lib/python*/{test,ctypes/test,distutils/tests,idlelib/idle_test,lib2to3/tests,sqlite3/test,tkinter/test,unittest/test}
+
+ # Why are these not done by default...
+ ln -s python3 "${pkgdir}"/usr/bin/python
+ ln -s python3-config "${pkgdir}"/usr/bin/python-config
+ ln -s idle3 "${pkgdir}"/usr/bin/idle
+ ln -s pydoc3 "${pkgdir}"/usr/bin/pydoc
+ ln -s python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python.1
+
+ # some useful "stuff" FS#46146
+ install -dm755 "${pkgdir}"/usr/lib/python${_pybasever}/Tools/{i18n,scripts}
+ install -m755 Tools/i18n/{msgfmt,pygettext}.py "${pkgdir}"/usr/lib/python${_pybasever}/Tools/i18n/
+ install -m755 Tools/scripts/{README,*py} "${pkgdir}"/usr/lib/python${_pybasever}/Tools/scripts/
+
+ # License
+ install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
+
+package_python-tests() {
+ pkgdesc="Regression tests packages for Python"
+ depends=('python')
+
+ cd Python-${pkgver}
+
+ make DESTDIR="${pkgdir}" EXTRA_CFLAGS="$CFLAGS" libinstall
+ cd "$pkgdir"/usr/lib/python*/
+ rm -r !(test|ctypes|distutils|idlelib|lib2to3|sqlite3|tkinter|unittest)
+ cd "$pkgdir"/usr/lib/python*/ctypes
+ rm -r !(test)
+ cd "$pkgdir"/usr/lib/python*/distutils
+ rm -r !(tests)
+ cd "$pkgdir"/usr/lib/python*/idlelib
+ rm -r !(idle_test)
+ cd "$pkgdir"/usr/lib/python*/lib2to3
+ rm -r !(tests)
+ cd "$pkgdir"/usr/lib/python*/sqlite3
+ rm -r !(test)
+ cd "$pkgdir"/usr/lib/python*/tkinter
+ rm -r !(test)
+ cd "$pkgdir"/usr/lib/python*/unittest
+ rm -r !(test)
+}
Deleted: genrebuild
===================================================================
--- genrebuild 2021-12-11 18:19:46 UTC (rev 431887)
+++ genrebuild 2021-12-11 18:19:56 UTC (rev 431888)
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-pyver=$(pacman -S --print-format %v python | grep -oP '^[0-9]+\.[0-9]+')
-exclude=('python2' 'python2-.*' 'pypy3\?' 'cython2' 'cuda' 'metasploit'
- 'dia' 'ghidra' 'kross-interpreters')
-
-{
-pacman -Fq /usr/lib/python${pyver}/ | grep -v archlinuxcn | cut -d / -f 2
-pacman -Fxq "\.cpython-${pyver/.}.pyc$" | grep -v archlinuxcn | cut -d / -f 2
-sogrep all libpython${pyver}.so
-ssh build.archlinux.org "parallel \"zstdgrep -q 'Py_Initialize\|PyInit_\|PyModule_Create2' {} && pacman -Qpq {}\" ::: /srv/ftp/pool/*/*.zst"
-} | grep -xvf <(printf "%s\n" "${exclude[@]}") | sort -u
Copied: python/repos/testing-x86_64/genrebuild (from rev 431887, python/trunk/genrebuild)
===================================================================
--- genrebuild (rev 0)
+++ genrebuild 2021-12-11 18:19:56 UTC (rev 431888)
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+pyver=$(pacman -S --print-format %v python | grep -oP '^[0-9]+\.[0-9]+')
+exclude=('python2' 'python2-.*' 'pypy3\?' 'cython2' 'cuda' 'cuda-tools'
+ 'metasploit' 'dia' 'ghidra' 'kross-interpreters')
+
+{
+pacman -Fq /usr/lib/python${pyver}/ | grep -v archlinuxcn | cut -d / -f 2
+pacman -Fxq "\.cpython-${pyver/.}.pyc$" | grep -v archlinuxcn | cut -d / -f 2
+sogrep all libpython${pyver}.so
+ssh build.archlinux.org "parallel \"zstdgrep -q 'Py_Initialize\|PyInit_\|PyModule_Create2' {} && pacman -Qpq {}\" ::: /srv/ftp/pool/*/*.zst"
+} | grep -xvf <(printf "%s\n" "${exclude[@]}") | sort -u
More information about the arch-commits
mailing list