From 5f4f355bf6c36aacf350e81d2b4d07d434dfce39 Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Wed, 16 Oct 2019 16:06:59 +0200 Subject: [PATCH] python3: update to 3.8.1. --- common/shlibs | 3 ++ srcpkgs/python3/files/cross.patch | 51 +++++++------------ .../python3/patches/fix-xattrs-glibc.patch | 13 ----- srcpkgs/python3/patches/libressl-2.6.patch | 26 ---------- srcpkgs/python3/template | 23 ++++----- 5 files changed, 31 insertions(+), 85 deletions(-) delete mode 100644 srcpkgs/python3/patches/fix-xattrs-glibc.patch delete mode 100644 srcpkgs/python3/patches/libressl-2.6.patch diff --git a/common/shlibs b/common/shlibs index 176e5ddba0..651484ab43 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1710,7 +1710,10 @@ libportaudiocpp.so.0 portaudio-cpp-19.20140130_1 libdar.so.6000 libdar-2.6.6_1 libdar64.so.6000 libdar-2.6.6_1 libpython3.so python3-3.6.2_1 +libdar.so.5000 libdar-2.4.14_1 libpython3.6m.so.1.0 python3-3.6.2_1 +libpython3.so python3-3.8.0_1 +libpython3.8.so.1.0 python3-3.8.0_1 libbrscandec2.so.1 brother-brscan3-0.2.11_2 libpyglib-2.0-python.so.0 python-gobject2-2.28.6_11 libxmlrpc_server_abyss.so.3 xmlrpc-c-1.25.28_1 diff --git a/srcpkgs/python3/files/cross.patch b/srcpkgs/python3/files/cross.patch index 3636347398..4e2498ca22 100644 --- a/srcpkgs/python3/files/cross.patch +++ b/srcpkgs/python3/files/cross.patch @@ -1,42 +1,25 @@ ---- setup.py.orig 2014-05-19 07:19:40.000000000 +0200 -+++ setup.py 2014-06-18 09:50:55.950072020 +0200 -@@ -17,7 +17,7 @@ from distutils.command.install_lib impor - from distutils.command.build_scripts import build_scripts - from distutils.spawn import find_executable +--- setup.py.orig ++++ setup.py +@@ -38,7 +38,7 @@ + return sys.platform --cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ -+cross_compiling = ("_PYTHON_HOST_PLATFORM" in os.environ) or ('PYTHONXCPREFIX' in os.environ) - def get_platform(): - # cross build -@@ -549,6 +549,11 @@ class PyBuildExt(build_ext): - if host_platform == 'darwin': - math_libs = [] +-CROSS_COMPILING = ("_PYTHON_HOST_PLATFORM" in os.environ) ++CROSS_COMPILING = ("_PYTHON_HOST_PLATFORM" in os.environ) or ('PYTHONXCPREFIX' in os.environ) + HOST_PLATFORM = get_platform() + MS_WINDOWS = (HOST_PLATFORM == 'win32') + CYGWIN = (HOST_PLATFORM == 'cygwin') +@@ -700,6 +700,10 @@ + if HOST_PLATFORM == 'hp-ux11': + self.lib_dirs += ['/usr/lib/hpux64', '/usr/lib/hpux32'] -+ # Insert libraries and headers from XBPS_CROSS_BASE + if 'XBPS_CROSS_BASE' in os.environ: -+ lib_dirs += [os.environ['XBPS_CROSS_BASE'] + '/usr/lib'] -+ inc_dirs += [os.environ['XBPS_CROSS_BASE'] + '/usr/include'] ++ self.lib_dirs += [os.environ['XBPS_CROSS_BASE'] + '/usr/lib'] ++ self.inc_dirs += [os.environ['XBPS_CROSS_BASE'] + '/usr/include'] + - # XXX Omitted modules: gl, pure, dl, SGI-specific modules - - # -@@ -1852,8 +1857,13 @@ class PyBuildExt(build_ext): - - # Pass empty CFLAGS because we'll just append the resulting - # CFLAGS to Python's; -g or -O2 is to be avoided. -- cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \ -- % (ffi_builddir, ffi_srcdir, " ".join(config_args)) -+ if cross_compiling: -+ cmd = "cd %s && env CFLAGS='' '%s/configure' --host=%s --build=%s %s" \ -+ % (ffi_builddir, ffi_srcdir, os.environ.get('HOSTARCH'), -+ os.environ.get('BUILDARCH'), " ".join(config_args)) -+ else: -+ cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \ -+ % (ffi_builddir, ffi_srcdir, " ".join(config_args)) - - res = os.system(cmd) - if res or not os.path.exists(ffi_configfile): + if MACOS: + # This should work on any unixy platform ;-) + # If the user has bothered specifying additional -I and -L flags --- Makefile.pre.in.orig 2017-07-08 05:33:27.000000000 +0200 +++ Makefile.pre.in 2017-08-27 19:49:11.114893045 +0200 @@ -1055,8 +1055,6 @@ diff --git a/srcpkgs/python3/patches/fix-xattrs-glibc.patch b/srcpkgs/python3/patches/fix-xattrs-glibc.patch deleted file mode 100644 index 909901293d..0000000000 --- a/srcpkgs/python3/patches/fix-xattrs-glibc.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- Modules/posixmodule.c.orig -+++ Modules/posixmodule.c -@@ -103,8 +103,9 @@ corresponding Unix manual entries for more information on calls."); - #undef HAVE_SCHED_SETAFFINITY - #endif - --#if defined(HAVE_SYS_XATTR_H) && defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__GNU__) -+#if defined(HAVE_SYS_XATTR_H) && defined(__linux__) && !defined(__FreeBSD_kernel__) && !defined(__GNU__) - #define USE_XATTRS -+#include - #endif - - #ifdef USE_XATTRS diff --git a/srcpkgs/python3/patches/libressl-2.6.patch b/srcpkgs/python3/patches/libressl-2.6.patch deleted file mode 100644 index 92dcf1ef06..0000000000 --- a/srcpkgs/python3/patches/libressl-2.6.patch +++ /dev/null @@ -1,26 +0,0 @@ -https://github.com/python/cpython/pull/4930 - ---- Lib/test/test_ssl.py.orig -+++ Lib/test/test_ssl.py -@@ -29,6 +29,12 @@ - PROTOCOLS = sorted(ssl._PROTOCOL_NAMES) - HOST = support.HOST - IS_LIBRESSL = ssl.OPENSSL_VERSION.startswith('LibreSSL') -+if IS_LIBRESSL: -+ LIBRESSL_VERSION = tuple( -+ int(s) for s in ssl.OPENSSL_VERSION.rsplit(' ')[-1].split('.') -+ ) -+else: -+ LIBRESSL_VERSION = () - IS_OPENSSL_1_1 = not IS_LIBRESSL and ssl.OPENSSL_VERSION_INFO >= (1, 1, 0) - - -@@ -3392,6 +3398,8 @@ def test_selected_npn_protocol(self): - chatty=True, connectionchatty=True) - self.assertIs(stats['client_npn_protocol'], None) - -+ @unittest.skipIf(IS_LIBRESSL and LIBRESSL_VERSION >= (2, 6, 1), -+ "LibreSSL 2.6.1+ has broken NPN support") - @unittest.skipUnless(ssl.HAS_NPN, "NPN support needed for this test") - def test_npn_protocols(self): - server_protocols = ['http/1.1', 'spdy/2'] diff --git a/srcpkgs/python3/template b/srcpkgs/python3/template index 0d74e07d1b..be73645653 100644 --- a/srcpkgs/python3/template +++ b/srcpkgs/python3/template @@ -3,7 +3,7 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python3-tkinter". # pkgname=python3 -version=3.6.10 +version=3.8.1 revision=1 wrksrc="Python-${version}" short_desc="Python programming language (${version%.*} series)" @@ -11,7 +11,7 @@ maintainer="Orphaned " license="Python-2.0" homepage="https://www.python.org" distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz" -checksum=0a833c398ac8cd7c5538f7232d8531afef943c60495c504484f308dac3af40de +checksum=75894117f6db7051c1b34f37410168844bbb357c139a8a10a352e9bf8be594e8 pycompile_dirs="usr/lib/python${version%.*}" hostmakedepends="pkg-config" @@ -27,8 +27,7 @@ alternatives=" python:python.1:/usr/share/man/man1/python${version%.*}.1" pre_configure() { - # Ensure that internal copies of zlib, expat and libffi are not used - rm -r Modules/zlib + # Ensure that internal copies of expat and libffi are not used rm -r Modules/expat rm -r Modules/_ctypes/{darwin,libffi}* } @@ -72,13 +71,13 @@ do_install() { rm -rf ${DESTDIR}/usr/lib/python${version%.*}/lib2to3/tests # Remove references to the install(1) wrapper. sed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i \ - ${DESTDIR}/usr/lib/python${version%.*}/_sysconfigdata_m_*.py \ - ${DESTDIR}/usr/lib/python${version%.*}/config-${version%.*}m*/Makefile + ${DESTDIR}/usr/lib/python${version%.*}/_sysconfigdata_*_*.py \ + ${DESTDIR}/usr/lib/python${version%.*}/config-${version%.*}*/Makefile if [ "$CROSS_BUILD" ]; then # Remove references to cross toolchain. sed -i "s/$XBPS_CROSS_TRIPLET-//g" \ - ${DESTDIR}/usr/lib/python${version%.*}/_sysconfigdata_m_*.py \ - ${DESTDIR}/usr/lib/python${version%.*}/config-${version%.*}m*/Makefile + ${DESTDIR}/usr/lib/python${version%.*}/_sysconfigdata_*_*.py \ + ${DESTDIR}/usr/lib/python${version%.*}/config-${version%.*}*/Makefile fi } @@ -89,10 +88,10 @@ python3-devel_package() { vmove usr/bin/python*-config vmove usr/lib/pkgconfig vmove usr/include - mv ${DESTDIR}/usr/lib/python${version%.*}/config-${version%.*}m*/libpython${version%.*}m.a \ + mv ${DESTDIR}/usr/lib/python${version%.*}/config-${version%.*}*/libpython${version%.*}*.a \ ${PKGDESTDIR}/usr/lib - mkdir -p ${DESTDIR}/usr/include/python${version%.*}m - mv ${PKGDESTDIR}/usr/include/python${version%.*}m/pyconfig.h \ - ${DESTDIR}/usr/include/python${version%.*}m + mkdir -p ${DESTDIR}/usr/include/python${version%.*} + mv ${PKGDESTDIR}/usr/include/python${version%.*}/pyconfig.h \ + ${DESTDIR}/usr/include/python${version%.*} } }