aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorRechi <Rechi@users.noreply.github.com>2018-07-23 14:00:00 +0200
committerRechi <Rechi@users.noreply.github.com>2018-07-23 14:00:00 +0200
commit13bb2391dd483cc366bb774bf2e8ad26b6840fb7 (patch)
treed8def83c8f85686dfad8299233222ea359592f60 /tools
parente4e0be756bd453538e9a04b5ef80fd6baccbcbca (diff)
[depends] bump python27 to 2.7.15
Diffstat (limited to 'tools')
-rw-r--r--tools/depends/native/python27-native/Makefile2
-rw-r--r--tools/depends/target/python27/Makefile2
-rw-r--r--tools/depends/target/python27/android-nl_langinfo.patch4
-rw-r--r--tools/depends/target/python27/android.patch2
-rw-r--r--tools/depends/target/python27/crosscompile.patch12
-rw-r--r--tools/depends/target/python27/fix-ffi.patch4
-rw-r--r--tools/depends/target/python27/make-fork-optional.patch2
-rw-r--r--tools/depends/target/python27/no-abort.patch4
-rw-r--r--tools/depends/target/python27/no-export-path.patch2
9 files changed, 17 insertions, 17 deletions
diff --git a/tools/depends/native/python27-native/Makefile b/tools/depends/native/python27-native/Makefile
index 8f7fb37f90..1854dac730 100644
--- a/tools/depends/native/python27-native/Makefile
+++ b/tools/depends/native/python27-native/Makefile
@@ -4,7 +4,7 @@ DEPS= ../../Makefile.include Makefile
# lib name, version
LIBNAME=Python
-VERSION=2.7.14
+VERSION=2.7.15
SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.xz
CWD=$(shell pwd)
diff --git a/tools/depends/target/python27/Makefile b/tools/depends/target/python27/Makefile
index 04b8ffa700..5016342cc7 100644
--- a/tools/depends/target/python27/Makefile
+++ b/tools/depends/target/python27/Makefile
@@ -4,7 +4,7 @@ DEPS= ../../Makefile.include Makefile crosscompile.patch android.patch no-export
# lib name, version
LIBNAME=Python
-VERSION=2.7.14
+VERSION=2.7.15
SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.xz
diff --git a/tools/depends/target/python27/android-nl_langinfo.patch b/tools/depends/target/python27/android-nl_langinfo.patch
index ddfed91a73..e3fec4a8d7 100644
--- a/tools/depends/target/python27/android-nl_langinfo.patch
+++ b/tools/depends/target/python27/android-nl_langinfo.patch
@@ -1,6 +1,6 @@
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
-@@ -294,7 +294,7 @@
+@@ -301,7 +301,7 @@
overridden = 1;
}
@@ -11,7 +11,7 @@
Python codec, and Py_FileSystemDefaultEncoding isn't
--- a/configure.ac
+++ b/configure.ac
-@@ -3088,7 +3088,7 @@
+@@ -3114,7 +3114,7 @@
getentropy \
getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
initgroups kill killpg lchmod lchown lstat mkfifo mknod mktime mmap \
diff --git a/tools/depends/target/python27/android.patch b/tools/depends/target/python27/android.patch
index aa80113c3d..6c0386f5e4 100644
--- a/tools/depends/target/python27/android.patch
+++ b/tools/depends/target/python27/android.patch
@@ -1,6 +1,6 @@
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
-@@ -3985,7 +3985,7 @@
+@@ -3991,7 +3991,7 @@
slave_fd = open(slave_name, O_RDWR | O_NOCTTY); /* open slave */
if (slave_fd < 0)
return posix_error();
diff --git a/tools/depends/target/python27/crosscompile.patch b/tools/depends/target/python27/crosscompile.patch
index 94caaa7fa9..5e33c1e829 100644
--- a/tools/depends/target/python27/crosscompile.patch
+++ b/tools/depends/target/python27/crosscompile.patch
@@ -8,7 +8,7 @@
PSRCS= \
Parser/acceler.c \
-@@ -514,9 +515,9 @@
+@@ -523,9 +524,9 @@
*\ -s*|s*) quiet="-q";; \
*) quiet="";; \
esac; \
@@ -20,7 +20,7 @@
# Build static library
# avoid long command lines, same as LIBRARY_OBJS
-@@ -1114,12 +1115,12 @@
+@@ -1131,12 +1132,12 @@
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
fi
@@ -35,7 +35,7 @@
$(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \
-d $(LIBDEST) -f \
-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
-@@ -1247,11 +1248,13 @@
+@@ -1264,11 +1265,13 @@
# Install the dynamically loadable modules
# This goes into $(exec_prefix)
sharedinstall: sharedmods
@@ -54,7 +54,7 @@
# Here are a couple of targets for MacOSX again, to install a full
--- a/configure.ac
+++ b/configure.ac
-@@ -328,7 +328,6 @@
+@@ -343,7 +343,6 @@
*)
# for now, limit cross builds to known configurations
MACHDEP="unknown"
@@ -62,7 +62,7 @@
esac
ac_sys_release=
else
-@@ -374,7 +373,6 @@
+@@ -389,7 +388,6 @@
*)
# for now, limit cross builds to known configurations
MACHDEP="unknown"
@@ -120,7 +120,7 @@
# XXX Omitted modules: gl, pure, dl, SGI-specific modules
#
-@@ -2051,8 +2060,13 @@
+@@ -2043,8 +2052,13 @@
# Pass empty CFLAGS because we'll just append the resulting
# CFLAGS to Python's; -g or -O2 is to be avoided.
diff --git a/tools/depends/target/python27/fix-ffi.patch b/tools/depends/target/python27/fix-ffi.patch
index c0989705af..8fe55100e2 100644
--- a/tools/depends/target/python27/fix-ffi.patch
+++ b/tools/depends/target/python27/fix-ffi.patch
@@ -1,6 +1,6 @@
--- a/Modules/_ctypes/cfield.c
+++ b/Modules/_ctypes/cfield.c
-@@ -1727,6 +1727,7 @@
+@@ -1735,6 +1735,7 @@
*/
/* align and size are bogus for void, but they must not be zero */
@@ -8,7 +8,7 @@
ffi_type ffi_type_void = { 1, 1, FFI_TYPE_VOID };
ffi_type ffi_type_uint8 = { 1, 1, FFI_TYPE_UINT8 };
-@@ -1743,14 +1744,14 @@
+@@ -1751,14 +1752,14 @@
ffi_type ffi_type_float = { sizeof(float), FLOAT_ALIGN, FFI_TYPE_FLOAT };
ffi_type ffi_type_double = { sizeof(double), DOUBLE_ALIGN, FFI_TYPE_DOUBLE };
diff --git a/tools/depends/target/python27/make-fork-optional.patch b/tools/depends/target/python27/make-fork-optional.patch
index 50df22d4dd..42b3bc9359 100644
--- a/tools/depends/target/python27/make-fork-optional.patch
+++ b/tools/depends/target/python27/make-fork-optional.patch
@@ -1,6 +1,6 @@
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
-@@ -162,6 +162,12 @@
+@@ -167,6 +167,12 @@
#endif /* ! __WATCOMC__ || __QNX__ */
#endif /* ! __IBMC__ */
diff --git a/tools/depends/target/python27/no-abort.patch b/tools/depends/target/python27/no-abort.patch
index 2ceb7dafbc..72f82b8332 100644
--- a/tools/depends/target/python27/no-abort.patch
+++ b/tools/depends/target/python27/no-abort.patch
@@ -1,6 +1,6 @@
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
-@@ -8643,7 +8643,7 @@
+@@ -8649,7 +8649,7 @@
static PyObject *
posix_abort(PyObject *self, PyObject *noargs)
{
@@ -11,7 +11,7 @@
return NULL;
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
-@@ -1697,7 +1697,7 @@
+@@ -1706,7 +1706,7 @@
DebugBreak();
#endif
#endif /* MS_WINDOWS */
diff --git a/tools/depends/target/python27/no-export-path.patch b/tools/depends/target/python27/no-export-path.patch
index d23b3513f5..95e295240a 100644
--- a/tools/depends/target/python27/no-export-path.patch
+++ b/tools/depends/target/python27/no-export-path.patch
@@ -1,6 +1,6 @@
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -1142,8 +1142,6 @@
+@@ -1159,8 +1159,6 @@
$(srcdir)/Lib/$(PLATDIR):
mkdir $(srcdir)/Lib/$(PLATDIR)
cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen