python: Update from 3.6.6 to 3.7.1

This commit is contained in:
Fredrik Fornwall
2018-10-21 21:16:53 +02:00
parent 2cfcf507aa
commit fc9fd770a4
12 changed files with 38 additions and 52 deletions

View File

@@ -0,0 +1,14 @@
diff -u -r ../Python-3.7.1/Lib/subprocess.py ./Lib/subprocess.py
--- ../Python-3.7.1/Lib/subprocess.py 2018-10-20 06:04:19.000000000 +0000
+++ ./Lib/subprocess.py 2018-10-20 20:17:50.157206343 +0000
@@ -1389,9 +1389,7 @@
args = list(args)
if shell:
- # On Android the default shell is at '/system/bin/sh'.
- unix_shell = ('/system/bin/sh' if
- hasattr(sys, 'getandroidapilevel') else '/bin/sh')
+ unix_shell = ('@TERMUX_PREFIX@/bin/sh')
args = [unix_shell, "-c"] + args
if executable:
args[0] = executable

View File

@@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="Python 3 programming language intended to enable clear p
TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libutil, libbz2, libsqlite, gdbm, ncurses-ui-libs, libcrypt, liblzma"
# Python.h includes crypt.h:
TERMUX_PKG_DEVPACKAGE_DEPENDS="libcrypt-dev"
_MAJOR_VERSION=3.6
TERMUX_PKG_VERSION=${_MAJOR_VERSION}.6
TERMUX_PKG_REVISION=2
TERMUX_PKG_SHA256=d79bc15d456e73a3173a2938f18a17e5149c850ebdedf84a78067f501ee6e16f
_MAJOR_VERSION=3.7
TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1
TERMUX_PKG_SHA256=fa7e2b8e8c9402f192ad56dc4f814089d1c4466c97d780f5e5acc02c04243d6d
TERMUX_PKG_SRCURL=https://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz
# The flag --with(out)-pymalloc (disable/enable specialized mallocs) is enabled by default and causes m suffix versions of python.

View File

@@ -1,26 +1,6 @@
diff -u -r ../Python-3.5.0/setup.py ./setup.py
--- ../Python-3.5.0/setup.py 2015-09-13 07:41:26.000000000 -0400
+++ ./setup.py 2015-11-07 17:31:45.332321322 -0500
@@ -592,7 +592,8 @@
libraries=math_libs) )
# time libraries: librt may be needed for clock_gettime()
- time_libs = []
+ # math_libs is needed by floatsleep()
+ time_libs = list(math_libs)
lib = sysconfig.get_config_var('TIMEMODULE_LIB')
if lib:
time_libs.append(lib)
@@ -651,7 +652,8 @@
missing.append('spwd')
# select(2); not on ancient System V
- exts.append( Extension('select', ['selectmodule.c']) )
+ # selectmodule.c calls the ceil(3) math function
+ exts.append( Extension('select', ['selectmodule.c'], libraries=math_libs) )
# Fred Drake's interface to the Python parser
exts.append( Extension('parser', ['parsermodule.c']) )
@@ -661,7 +663,8 @@
# Lance Ellinghaus's syslog module

View File

@@ -1,12 +0,0 @@
diff -u -r ../Python-3.4.1/Lib/subprocess.py ./Lib/subprocess.py
--- ../Python-3.4.1/Lib/subprocess.py 2014-05-19 07:19:38.000000000 +0200
+++ ./Lib/subprocess.py 2014-06-04 11:31:48.708843737 +0200
@@ -1344,7 +1344,7 @@
args = list(args)
if shell:
- args = ["/bin/sh", "-c"] + args
+ args = ["@TERMUX_PREFIX@/bin/sh", "-c"] + args
if executable:
args[0] = executable