[arch-commits] Commit in python/repos (3 files)
Felix Yan
felixonmars at archlinux.org
Wed Oct 23 19:27:25 UTC 2019
Date: Wednesday, October 23, 2019 @ 19:27:24
Author: felixonmars
Revision: 365413
archrelease: copy trunk to staging-x86_64
Added:
python/repos/staging-x86_64/
python/repos/staging-x86_64/0001-compileall-Fix-ddir-when-recursing.patch
(from rev 365412, python/trunk/0001-compileall-Fix-ddir-when-recursing.patch)
python/repos/staging-x86_64/PKGBUILD
(from rev 365412, python/trunk/PKGBUILD)
-----------------------------------------------+
0001-compileall-Fix-ddir-when-recursing.patch | 57 ++++++++++
PKGBUILD | 129 ++++++++++++++++++++++++
2 files changed, 186 insertions(+)
Copied: python/repos/staging-x86_64/0001-compileall-Fix-ddir-when-recursing.patch (from rev 365412, python/trunk/0001-compileall-Fix-ddir-when-recursing.patch)
===================================================================
--- staging-x86_64/0001-compileall-Fix-ddir-when-recursing.patch (rev 0)
+++ staging-x86_64/0001-compileall-Fix-ddir-when-recursing.patch 2019-10-23 19:27:24 UTC (rev 365413)
@@ -0,0 +1,57 @@
+From 84fdbc156ed424d030686de350fbfc6c3593263f Mon Sep 17 00:00:00 2001
+Message-Id: <84fdbc156ed424d030686de350fbfc6c3593263f.1537028533.git.jan.steffens at gmail.com>
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Sat, 15 Sep 2018 18:22:06 +0200
+Subject: [PATCH] compileall: Fix ddir when recursing
+
+---
+ Lib/compileall.py | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/Lib/compileall.py b/Lib/compileall.py
+index 72592126d7..70e246fd96 100644
+--- a/Lib/compileall.py
++++ b/Lib/compileall.py
+@@ -45,12 +45,16 @@ def _walk_dir(dir, ddir=None, maxlevels=10, quiet=0):
+ else:
+ dfile = None
+ if not os.path.isdir(fullname):
+- yield fullname
++ yield fullname, ddir
+ elif (maxlevels > 0 and name != os.curdir and name != os.pardir and
+ os.path.isdir(fullname) and not os.path.islink(fullname)):
+ yield from _walk_dir(fullname, ddir=dfile,
+ maxlevels=maxlevels - 1, quiet=quiet)
+
++def _compile_one(file_ddir, *args, **kwargs):
++ file, ddir = file_ddir
++ return compile_file(file, ddir, *args, **kwargs)
++
+ def compile_dir(dir, maxlevels=10, ddir=None, force=False, rx=None,
+ quiet=0, legacy=False, optimize=-1, workers=1,
+ invalidation_mode=py_compile.PycInvalidationMode.TIMESTAMP):
+@@ -79,17 +83,17 @@ def compile_dir(dir, maxlevels=10, ddir=None, force=False, rx=None,
+ if workers is not None and workers != 1 and ProcessPoolExecutor is not None:
+ workers = workers or None
+ with ProcessPoolExecutor(max_workers=workers) as executor:
+- results = executor.map(partial(compile_file,
+- ddir=ddir, force=force,
++ results = executor.map(partial(_compile_one,
++ force=force,
+ rx=rx, quiet=quiet,
+ legacy=legacy,
+ optimize=optimize,
+ invalidation_mode=invalidation_mode),
+ files)
+ success = min(results, default=True)
+ else:
+- for file in files:
+- if not compile_file(file, ddir, force, rx, quiet,
++ for file_ddir in files:
++ if not _compile_one(file_ddir, force, rx, quiet,
+ legacy, optimize, invalidation_mode):
+ success = False
+ return success
+--
+2.18.0
+
Copied: python/repos/staging-x86_64/PKGBUILD (from rev 365412, python/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2019-10-23 19:27:24 UTC (rev 365413)
@@ -0,0 +1,129 @@
+# 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>
+
+pkgname=python
+pkgver=3.8.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=('expat' 'bzip2' 'gdbm' 'openssl' 'libffi' 'zlib' 'libnsl')
+makedepends=('tk' 'sqlite' 'valgrind' 'bluez-libs' 'mpdecimal' 'llvm' 'gdb' 'xorg-server-xvfb')
+optdepends=('python-setuptools'
+ 'python-pip'
+ 'sqlite'
+ 'mpdecimal: for decimal'
+ 'xz: for lzma'
+ 'tk: for tkinter')
+provides=('python3')
+replaces=('python3')
+source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz"{,.asc}
+ 0001-compileall-Fix-ddir-when-recursing.patch)
+sha512sums=('5f9bfcb3acdf592770a9d5abd2c32c68c55a49b92f958ded069e3ef31cf2d415e67112b4f6738fab237dc29e5c622298719946d2e9471e7e78e3a6bdf2fac1d1'
+ 'SKIP'
+ 'ebd04c3b6d41321b1f0d439d356e0ce463760db55dc64109854c70d017cf56608aa19de9fc4a21bf840795ff202b4703444f9af8074b661780798c17e03089ff')
+validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D' # Ned Deily (Python release signing key) <nad at python.org>
+ 'E3FF2839C048B25C084DEBE9B26995E310250568') # Łukasz Langa (GPG langa.pl) <lukasz at langa.pl>
+
+prepare() {
+ cd Python-${pkgver}
+
+ # FS#59997
+ patch -p1 -i ../0001-compileall-Fix-ddir-when-recursing.patch
+
+ # https://bugs.python.org/issue34587
+ sed -i -e "s|testCongestion|disabled_&|" Lib/test/test_socket.py
+
+ # 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-threads \
+ --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
+
+ # 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 1280x720x24 -ac +extension GLX" -a -n "$servernum" make EXTRA_CFLAGS="$CFLAGS"
+}
+
+check() {
+ # test_gdb is expected to fail with LTO
+ # test_idle, test_tk, test_ttk_guionly segfaults since 3.6.5
+
+ # https://bugs.python.org/issue34022
+ # test_cmd_line_script, test_compileall, test_importlib,
+ # test_multiprocessing_main_handling, test_py_compile, test_runpy
+
+ 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 1280x720x24 -ac +extension GLX" -a -n "$servernum" \
+ "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x test_gdb -x test_idle -x test_tk -x test_ttk_guionly \
+ -x test_cmd_line_script -x test_compileall -x test_importlib -x test_multiprocessing_main_handling -x test_py_compile -x test_runpy \
+ -x test_httplib
+}
+
+package() {
+ 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
+
+ # 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"
+}
More information about the arch-commits
mailing list