Browse Source

python: Update from 3.5.1 to 3.5.2

The local fileutils.c patch can now be removed as it has been
merged upstream:
35003947f3
android-5
Fredrik Fornwall 8 years ago
parent
commit
e229609ba1
  1. 3
      packages/python/build.sh
  2. 23
      packages/python/fileutils.c.patch

3
packages/python/build.sh

@ -8,8 +8,7 @@ TERMUX_PKG_DEPENDS="libandroid-support, ncurses, readline, libffi, openssl, libu
TERMUX_PKG_HOSTBUILD=true TERMUX_PKG_HOSTBUILD=true
_MAJOR_VERSION=3.5 _MAJOR_VERSION=3.5
TERMUX_PKG_VERSION=${_MAJOR_VERSION}.1 TERMUX_PKG_VERSION=${_MAJOR_VERSION}.2
TERMUX_PKG_BUILD_REVISION=8
TERMUX_PKG_SRCURL=http://www.python.org/ftp/python/${TERMUX_PKG_VERSION}/Python-${TERMUX_PKG_VERSION}.tar.xz TERMUX_PKG_SRCURL=http://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. # The flag --with(out)-pymalloc (disable/enable specialized mallocs) is enabled by default and causes m suffix versions of python.

23
packages/python/fileutils.c.patch

@ -1,23 +0,0 @@
diff -u -r ../Python-3.5.1/Python/fileutils.c ./Python/fileutils.c
--- ../Python-3.5.1/Python/fileutils.c 2015-12-06 20:39:11.000000000 -0500
+++ ./Python/fileutils.c 2016-05-18 19:46:49.466741203 -0400
@@ -856,7 +856,7 @@
return 0;
}
- if (errno != ENOTTY) {
+ if (errno != ENOTTY && errno != EACCES) {
if (raise)
PyErr_SetFromErrno(PyExc_OSError);
return -1;
@@ -865,7 +865,9 @@
/* Issue #22258: Here, ENOTTY means "Inappropriate ioctl for
device". The ioctl is declared but not supported by the kernel.
Remember that ioctl() doesn't work. It is the case on
- Illumos-based OS for example. */
+ Illumos-based OS for example.
+ EACCES may be the result of an SELinux policy disabling
+ ioctl on sockets. This is the case on Android. */
ioctl_works = 0;
}
/* fallback to fcntl() if ioctl() does not work */
Loading…
Cancel
Save