[arch-commits] Commit in python2/repos/extra-x86_64 (4 files)
Felix Yan
felixonmars at archlinux.org
Sat Sep 5 11:55:45 UTC 2020
Date: Saturday, September 5, 2020 @ 11:55:45
Author: felixonmars
Revision: 395474
archrelease: copy trunk to extra-x86_64
Added:
python2/repos/extra-x86_64/PKGBUILD
(from rev 395473, python2/trunk/PKGBUILD)
python2/repos/extra-x86_64/mtime-workaround.patch
(from rev 395473, python2/trunk/mtime-workaround.patch)
Deleted:
python2/repos/extra-x86_64/PKGBUILD
python2/repos/extra-x86_64/mtime-workaround.patch
------------------------+
PKGBUILD | 256 +++++++++++++++++++++++------------------------
mtime-workaround.patch | 20 +--
2 files changed, 138 insertions(+), 138 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-09-05 11:55:31 UTC (rev 395473)
+++ PKGBUILD 2020-09-05 11:55:45 UTC (rev 395474)
@@ -1,128 +0,0 @@
-# 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=python2
-pkgver=2.7.18
-pkgrel=1
-_pybasever=2.7
-pkgdesc="A high-level scripting language"
-arch=('x86_64')
-license=('PSF')
-url="https://www.python.org/"
-depends=('bzip2' 'expat' 'gdbm' 'libffi' 'libnsl' 'openssl' 'sqlite' 'zlib')
-makedepends=('tk' 'bluez-libs')
-checkdepends=('gdb' 'file' 'xorg-server-xvfb')
-optdepends=('tk: for IDLE'
- 'python2-setuptools'
- 'python2-pip')
-conflicts=('python<3')
-source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"{,.asc}
- mtime-workaround.patch)
-sha512sums=('a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c'
- 'SKIP'
- '4e761cfd57791e8b72ecdf84c2e03875bf074311130eea5b8e97409fa304fa3468dbd359a511c4e9978e686e662c58054b4174d3e73f845fa9ded2e83a3a8076')
-validpgpkeys=('C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF') # Benjamin Peterson
-
-prepare() {
- cd Python-${pkgver}
-
- # makepkg will touch all files to $SOURCE_DATE_EPOCH which will break pyc file's mtime check.
- # workaround this by touching them to $SOURCE_DATE_EPOCH before running compileall.
- patch -p0 -i ../mtime-workaround.patch
-
- # Temporary workaround for FS#22322
- # See http://bugs.python.org/issue10835 for upstream report
- sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
-
- # Enable built-in SQLite module to load extensions (fix FS#22122)
- sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
-
- # FS#23997
- sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
-
- sed -i "s/python2.3/python2/g" Lib/distutils/tests/test_build_scripts.py \
- Lib/distutils/tests/test_install_scripts.py
-
- # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
- # rather than copies shipped in the tarball
- rm -r Modules/expat
- rm -r Modules/zlib
- rm -r Modules/_ctypes/{darwin,libffi}*
-
- # clean up #!s
- find . -name '*.py' | \
- xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
-
- # Workaround asdl_c.py/makeopcodetargets.py errors after we touched the shebangs
- touch Include/Python-ast.h Python/Python-ast.c Python/opcode_targets.h
-}
-
-build() {
- cd "${srcdir}/Python-${pkgver}"
-
- export OPT="${CFLAGS}"
- ./configure --prefix=/usr \
- --enable-shared \
- --with-threads \
- --enable-optimizations \
- --with-lto \
- --enable-ipv6 \
- --enable-unicode=ucs4 \
- --with-system-expat \
- --with-system-ffi \
- --with-dbmliborder=gdbm:ndbm \
- --without-ensurepip
-
- make
-}
-
-check() {
- # Since 2.7.14 with latest xvfb
- # test_idle, test_tk, test_ttk_guionly: segfaults
- # Since 2.7.15: test_ctypes
- # test_ftplib test_imaplib test_urllib2_localnet: krb5 errors
-
- cd Python-${pkgver}
- LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
- xvfb-run "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x test_idle test_tk test_ttk_guionly test_ctypes test_ssl test_ftplib test_imaplib test_urllib2_localnet
-}
-
-package() {
- cd Python-${pkgver}
-
- # Hack to avoid building again
- sed -i 's/^all:.*$/all: build_all/' Makefile
-
- make DESTDIR="${pkgdir}" altinstall maninstall
-
- rm "${pkgdir}"/usr/share/man/man1/python.1
-
- ln -sf python${_pybasever} "${pkgdir}"/usr/bin/python2
- ln -sf python${_pybasever}-config "${pkgdir}"/usr/bin/python2-config
- ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python2.1
-
- # FS#33954
- ln -sf python-${_pybasever}.pc "${pkgdir}"/usr/lib/pkgconfig/python2.pc
-
- ln -sf ../../libpython${_pybasever}.so "${pkgdir}"/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
-
- mv "${pkgdir}"/usr/bin/smtpd.py "${pkgdir}"/usr/lib/python${_pybasever}/
-
- # some useful "stuff"
- 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/
-
- # fix conflicts with python
- mv "${pkgdir}"/usr/bin/idle{,2}
- mv "${pkgdir}"/usr/bin/pydoc{,2}
- mv "${pkgdir}"/usr/bin/2to3{,-2.7}
-
- # clean-up reference to build directory
- sed -i "s#${srcdir}/Python-${pkgver}:##" "${pkgdir}"/usr/lib/python${_pybasever}/config/Makefile
-
- # license
- install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
Copied: python2/repos/extra-x86_64/PKGBUILD (from rev 395473, python2/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-09-05 11:55:45 UTC (rev 395474)
@@ -0,0 +1,128 @@
+# 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=python2
+pkgver=2.7.18
+pkgrel=2
+_pybasever=2.7
+pkgdesc="A high-level scripting language"
+arch=('x86_64')
+license=('PSF')
+url="https://www.python.org/"
+depends=('bzip2' 'expat' 'gdbm' 'libffi' 'libnsl' 'libxcrypt' 'openssl' 'sqlite' 'zlib')
+makedepends=('tk' 'bluez-libs')
+checkdepends=('gdb' 'file' 'xorg-server-xvfb')
+optdepends=('tk: for IDLE'
+ 'python2-setuptools'
+ 'python2-pip')
+conflicts=('python<3')
+source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"{,.asc}
+ mtime-workaround.patch)
+sha512sums=('a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c'
+ 'SKIP'
+ '4e761cfd57791e8b72ecdf84c2e03875bf074311130eea5b8e97409fa304fa3468dbd359a511c4e9978e686e662c58054b4174d3e73f845fa9ded2e83a3a8076')
+validpgpkeys=('C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF') # Benjamin Peterson
+
+prepare() {
+ cd Python-${pkgver}
+
+ # makepkg will touch all files to $SOURCE_DATE_EPOCH which will break pyc file's mtime check.
+ # workaround this by touching them to $SOURCE_DATE_EPOCH before running compileall.
+ patch -p0 -i ../mtime-workaround.patch
+
+ # Temporary workaround for FS#22322
+ # See http://bugs.python.org/issue10835 for upstream report
+ sed -i "/progname =/s/python/python${_pybasever}/" Python/pythonrun.c
+
+ # Enable built-in SQLite module to load extensions (fix FS#22122)
+ sed -i "/SQLITE_OMIT_LOAD_EXTENSION/d" setup.py
+
+ # FS#23997
+ sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
+
+ sed -i "s/python2.3/python2/g" Lib/distutils/tests/test_build_scripts.py \
+ Lib/distutils/tests/test_install_scripts.py
+
+ # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
+ # rather than copies shipped in the tarball
+ rm -r Modules/expat
+ rm -r Modules/zlib
+ rm -r Modules/_ctypes/{darwin,libffi}*
+
+ # clean up #!s
+ find . -name '*.py' | \
+ xargs sed -i "s|#[ ]*![ ]*/usr/bin/env python$|#!/usr/bin/env python2|"
+
+ # Workaround asdl_c.py/makeopcodetargets.py errors after we touched the shebangs
+ touch Include/Python-ast.h Python/Python-ast.c Python/opcode_targets.h
+}
+
+build() {
+ cd "${srcdir}/Python-${pkgver}"
+
+ export OPT="${CFLAGS}"
+ ./configure --prefix=/usr \
+ --enable-shared \
+ --with-threads \
+ --enable-optimizations \
+ --with-lto \
+ --enable-ipv6 \
+ --enable-unicode=ucs4 \
+ --with-system-expat \
+ --with-system-ffi \
+ --with-dbmliborder=gdbm:ndbm \
+ --without-ensurepip
+
+ make
+}
+
+check() {
+ # Since 2.7.14 with latest xvfb
+ # test_idle, test_tk, test_ttk_guionly: segfaults
+ # Since 2.7.15: test_ctypes
+ # test_ftplib test_imaplib test_urllib2_localnet: krb5 errors
+
+ cd Python-${pkgver}
+ LD_LIBRARY_PATH="${srcdir}/Python-${pkgver}":${LD_LIBRARY_PATH} \
+ xvfb-run "${srcdir}/Python-${pkgver}/python" -m test.regrtest -v -uall -x test_idle test_tk test_ttk_guionly test_ctypes test_ssl test_ftplib test_imaplib test_urllib2_localnet
+}
+
+package() {
+ cd Python-${pkgver}
+
+ # Hack to avoid building again
+ sed -i 's/^all:.*$/all: build_all/' Makefile
+
+ make DESTDIR="${pkgdir}" altinstall maninstall
+
+ rm "${pkgdir}"/usr/share/man/man1/python.1
+
+ ln -sf python${_pybasever} "${pkgdir}"/usr/bin/python2
+ ln -sf python${_pybasever}-config "${pkgdir}"/usr/bin/python2-config
+ ln -sf python${_pybasever}.1 "${pkgdir}"/usr/share/man/man1/python2.1
+
+ # FS#33954
+ ln -sf python-${_pybasever}.pc "${pkgdir}"/usr/lib/pkgconfig/python2.pc
+
+ ln -sf ../../libpython${_pybasever}.so "${pkgdir}"/usr/lib/python${_pybasever}/config/libpython${_pybasever}.so
+
+ mv "${pkgdir}"/usr/bin/smtpd.py "${pkgdir}"/usr/lib/python${_pybasever}/
+
+ # some useful "stuff"
+ 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/
+
+ # fix conflicts with python
+ mv "${pkgdir}"/usr/bin/idle{,2}
+ mv "${pkgdir}"/usr/bin/pydoc{,2}
+ mv "${pkgdir}"/usr/bin/2to3{,-2.7}
+
+ # clean-up reference to build directory
+ sed -i "s#${srcdir}/Python-${pkgver}:##" "${pkgdir}"/usr/lib/python${_pybasever}/config/Makefile
+
+ # license
+ install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
Deleted: mtime-workaround.patch
===================================================================
--- mtime-workaround.patch 2020-09-05 11:55:31 UTC (rev 395473)
+++ mtime-workaround.patch 2020-09-05 11:55:45 UTC (rev 395474)
@@ -1,10 +0,0 @@
---- Makefile.pre.in.orig 2020-03-21 08:40:27.031543502 +0800
-+++ Makefile.pre.in 2020-03-21 08:47:27.277107917 +0800
-@@ -1137,6 +1137,7 @@
- $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
- $(DESTDIR)$(LIBDEST)/distutils/tests ; \
- fi
-+ find $(DESTDIR)$(LIBDEST) -exec touch -h -d @$(SOURCE_DATE_EPOCH) {} +
- PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
- $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
- -d $(LIBDEST) -f \
Copied: python2/repos/extra-x86_64/mtime-workaround.patch (from rev 395473, python2/trunk/mtime-workaround.patch)
===================================================================
--- mtime-workaround.patch (rev 0)
+++ mtime-workaround.patch 2020-09-05 11:55:45 UTC (rev 395474)
@@ -0,0 +1,10 @@
+--- Makefile.pre.in.orig 2020-03-21 08:40:27.031543502 +0800
++++ Makefile.pre.in 2020-03-21 08:47:27.277107917 +0800
+@@ -1137,6 +1137,7 @@
+ $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
+ $(DESTDIR)$(LIBDEST)/distutils/tests ; \
+ fi
++ find $(DESTDIR)$(LIBDEST) -exec touch -h -d @$(SOURCE_DATE_EPOCH) {} +
+ PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
+ $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \
+ -d $(LIBDEST) -f \
More information about the arch-commits
mailing list