diff options
author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-18 20:04:24 +0100 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-19 20:42:42 +0100 |
commit | 04c5ca5b27062e58137db4f2e04b207c222f6dd5 (patch) | |
tree | c20ebc982cfa3e19ad7e1aaaa17f47e728007beb /patches | |
parent | 0526aadacb1305d48b756ae4674dbd197dd5fa92 (diff) | |
download | ptxdist-04c5ca5b27062e58137db4f2e04b207c222f6dd5.tar.gz ptxdist-04c5ca5b27062e58137db4f2e04b207c222f6dd5.tar.xz |
python: version bump 2.7.13 -> 2.7.15
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
-rw-r--r-- | patches/Python-2.7.15/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch (renamed from patches/Python-2.7.13/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch) | 12 | ||||
-rw-r--r-- | patches/Python-2.7.15/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch (renamed from patches/Python-2.7.13/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch) | 4 | ||||
-rw-r--r-- | patches/Python-2.7.15/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch (renamed from patches/Python-2.7.13/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch) | 4 | ||||
-rw-r--r-- | patches/Python-2.7.15/0004-setup.py-don-t-leak-host-path-into-cross-compilation.patch (renamed from patches/Python-2.7.13/0004-setup.py-don-t-leak-host-path-into-cross-compilation.patch) | 2 | ||||
-rw-r--r-- | patches/Python-2.7.15/0005-add-cross-compilation-support.patch (renamed from patches/Python-2.7.13/0005-add-cross-compilation-support.patch) | 10 | ||||
-rw-r--r-- | patches/Python-2.7.15/0006-python-don-t-add-rpaths-in-setup.py.patch (renamed from patches/Python-2.7.13/0006-python-don-t-add-rpaths-in-setup.py.patch) | 2 | ||||
-rw-r--r-- | patches/Python-2.7.15/0007-add-more-search-paths.patch (renamed from patches/Python-2.7.13/0007-add-more-search-paths.patch) | 2 | ||||
-rw-r--r-- | patches/Python-2.7.15/0008-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch (renamed from patches/Python-2.7.13/0008-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch) | 4 | ||||
-rw-r--r-- | patches/Python-2.7.15/0009-python2-prevent-host-path-leakage.patch (renamed from patches/Python-2.7.13/0009-python2-prevent-host-path-leakage.patch) | 2 | ||||
-rwxr-xr-x | patches/Python-2.7.15/autogen.sh (renamed from patches/Python-2.7.13/autogen.sh) | 0 | ||||
-rw-r--r-- | patches/Python-2.7.15/series (renamed from patches/Python-2.7.13/series) | 0 |
11 files changed, 21 insertions, 21 deletions
diff --git a/patches/Python-2.7.13/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch b/patches/Python-2.7.15/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch index 7004b406f..65366650e 100644 --- a/patches/Python-2.7.13/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch +++ b/patches/Python-2.7.15/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch @@ -35,7 +35,7 @@ index ad307f65398b..f72ae886cad8 100644 AF_MAX = PF_MAX SOL_RAW = 255 diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c -index 3e3c05f54079..0deb827e1925 100644 +index 8d3670529e85..f1c0bab247b0 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -448,6 +448,10 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t size); @@ -51,7 +51,7 @@ index 3e3c05f54079..0deb827e1925 100644 */ @@ -1125,6 +1129,22 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen, int proto) } - #endif + #endif /* ENABLE_IPV6 */ +#ifdef ENABLE_CAN + case AF_CAN: @@ -74,7 +74,7 @@ index 3e3c05f54079..0deb827e1925 100644 switch (proto) { @@ -1411,6 +1431,28 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, } - #endif + #endif /* ENABLE_IPV6 */ +#ifdef ENABLE_CAN + case AF_CAN: @@ -103,7 +103,7 @@ index 3e3c05f54079..0deb827e1925 100644 { @@ -1662,6 +1704,14 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret) } - #endif + #endif /* ENABLE_IPV6 */ +#ifdef ENABLE_CAN + case AF_CAN: @@ -199,10 +199,10 @@ index d98e00e88d27..3b6e22e29d3a 100644 struct sockaddr_l2 bt_l2; struct sockaddr_rc bt_rc; diff --git a/configure.ac b/configure.ac -index 127346502c3b..e56d674f60da 100644 +index 913d5469d06e..675f56835e59 100644 --- a/configure.ac +++ b/configure.ac -@@ -1720,6 +1720,19 @@ AC_CHECK_HEADERS(linux/netlink.h,,,[ +@@ -1746,6 +1746,19 @@ AC_CHECK_HEADERS(linux/netlink.h,,,[ #endif ]) diff --git a/patches/Python-2.7.13/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch b/patches/Python-2.7.15/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch index 21f8e9b21..58058cfde 100644 --- a/patches/Python-2.7.13/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch +++ b/patches/Python-2.7.15/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch @@ -12,10 +12,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac -index e56d674f60da..f7ea172c61bc 100644 +index 675f56835e59..c9cb9c802882 100644 --- a/configure.ac +++ b/configure.ac -@@ -1857,15 +1857,11 @@ AC_CHECK_SIZEOF(fpos_t, 4) +@@ -1883,15 +1883,11 @@ AC_CHECK_SIZEOF(fpos_t, 4) AC_CHECK_SIZEOF(size_t, 4) AC_CHECK_SIZEOF(pid_t, 4) diff --git a/patches/Python-2.7.13/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch b/patches/Python-2.7.15/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch index e4a45398b..f6c3f9143 100644 --- a/patches/Python-2.7.13/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch +++ b/patches/Python-2.7.15/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch @@ -11,10 +11,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac -index f7ea172c61bc..d14c74bb700b 100644 +index c9cb9c802882..c89e4a601cf1 100644 --- a/configure.ac +++ b/configure.ac -@@ -1864,16 +1864,8 @@ if test "$ac_cv_type_long_long_int" = "yes" ; then +@@ -1890,16 +1890,8 @@ if test "$ac_cv_type_long_long_int" = "yes" ; then AC_DEFINE(HAVE_LONG_LONG, 1, [Define this if you have the type long long.]) fi diff --git a/patches/Python-2.7.13/0004-setup.py-don-t-leak-host-path-into-cross-compilation.patch b/patches/Python-2.7.15/0004-setup.py-don-t-leak-host-path-into-cross-compilation.patch index ef35a68d4..95a97e3f4 100644 --- a/patches/Python-2.7.13/0004-setup.py-don-t-leak-host-path-into-cross-compilation.patch +++ b/patches/Python-2.7.15/0004-setup.py-don-t-leak-host-path-into-cross-compilation.patch @@ -12,7 +12,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> 1 file changed, 3 insertions(+) diff --git a/setup.py b/setup.py -index 54054c208a76..b2b793cf5d29 100644 +index 33cecc687573..521b6e77c234 100644 --- a/setup.py +++ b/setup.py @@ -1228,6 +1228,9 @@ class PyBuildExt(build_ext): diff --git a/patches/Python-2.7.13/0005-add-cross-compilation-support.patch b/patches/Python-2.7.15/0005-add-cross-compilation-support.patch index 116d40216..79efeba4e 100644 --- a/patches/Python-2.7.13/0005-add-cross-compilation-support.patch +++ b/patches/Python-2.7.15/0005-add-cross-compilation-support.patch @@ -11,10 +11,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Makefile.pre.in b/Makefile.pre.in -index e28896406f6f..b404fbb9eb54 100644 +index 9297e7fc89c4..1400c8ca6f97 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in -@@ -89,6 +89,10 @@ CFLAGSFORSHARED=@CFLAGSFORSHARED@ +@@ -88,6 +88,10 @@ CFLAGSFORSHARED=@CFLAGSFORSHARED@ # C flags used for building the interpreter object files PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE @@ -25,7 +25,7 @@ index e28896406f6f..b404fbb9eb54 100644 # Machine-dependent subdirectories MACHDEP= @MACHDEP@ -@@ -107,11 +111,11 @@ datarootdir= @datarootdir@ +@@ -106,11 +110,11 @@ datarootdir= @datarootdir@ # Expanded directories BINDIR= @bindir@ @@ -42,10 +42,10 @@ index e28896406f6f..b404fbb9eb54 100644 # Detailed destination directories BINLIBDEST= $(LIBDIR)/python$(VERSION) diff --git a/configure.ac b/configure.ac -index d14c74bb700b..6631dc233528 100644 +index c89e4a601cf1..863d7929507b 100644 --- a/configure.ac +++ b/configure.ac -@@ -966,6 +966,13 @@ if test "$cross_compiling" = yes; then +@@ -980,6 +980,13 @@ if test "$cross_compiling" = yes; then RUNSHARED= fi diff --git a/patches/Python-2.7.13/0006-python-don-t-add-rpaths-in-setup.py.patch b/patches/Python-2.7.15/0006-python-don-t-add-rpaths-in-setup.py.patch index d8d150737..d9fa6fe92 100644 --- a/patches/Python-2.7.13/0006-python-don-t-add-rpaths-in-setup.py.patch +++ b/patches/Python-2.7.15/0006-python-don-t-add-rpaths-in-setup.py.patch @@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 2 deletions(-) diff --git a/setup.py b/setup.py -index b2b793cf5d29..d761cbd29365 100644 +index 521b6e77c234..213a4d969fbc 100644 --- a/setup.py +++ b/setup.py @@ -1101,7 +1101,6 @@ class PyBuildExt(build_ext): diff --git a/patches/Python-2.7.13/0007-add-more-search-paths.patch b/patches/Python-2.7.15/0007-add-more-search-paths.patch index 559a57955..3e6e234ee 100644 --- a/patches/Python-2.7.13/0007-add-more-search-paths.patch +++ b/patches/Python-2.7.15/0007-add-more-search-paths.patch @@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py -index d761cbd29365..8873831323f0 100644 +index 213a4d969fbc..4ce7075150d1 100644 --- a/setup.py +++ b/setup.py @@ -502,8 +502,10 @@ class PyBuildExt(build_ext): diff --git a/patches/Python-2.7.13/0008-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch b/patches/Python-2.7.15/0008-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch index 91ec308c6..bd98f681c 100644 --- a/patches/Python-2.7.13/0008-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch +++ b/patches/Python-2.7.15/0008-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch @@ -11,10 +11,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 6631dc233528..669624d53735 100644 +index 863d7929507b..661cd3dcb76c 100644 --- a/configure.ac +++ b/configure.ac -@@ -912,7 +912,7 @@ if test $enable_shared = "yes"; then +@@ -926,7 +926,7 @@ if test $enable_shared = "yes"; then Linux*|GNU*|NetBSD*|FreeBSD*|DragonFly*|OpenBSD*) LDLIBRARY='libpython$(VERSION).so' BLDLIBRARY='-L. -lpython$(VERSION)' diff --git a/patches/Python-2.7.13/0009-python2-prevent-host-path-leakage.patch b/patches/Python-2.7.15/0009-python2-prevent-host-path-leakage.patch index e2c35e1f9..ab5e0d42f 100644 --- a/patches/Python-2.7.13/0009-python2-prevent-host-path-leakage.patch +++ b/patches/Python-2.7.15/0009-python2-prevent-host-path-leakage.patch @@ -23,7 +23,7 @@ Signed-off-by: Bastian Stender <bst@pengutronix.de> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py -index 8873831323f0..bd663dcfbec0 100644 +index 4ce7075150d1..29b9de4a4607 100644 --- a/setup.py +++ b/setup.py @@ -458,9 +458,9 @@ class PyBuildExt(build_ext): diff --git a/patches/Python-2.7.13/autogen.sh b/patches/Python-2.7.15/autogen.sh index 903ce7847..903ce7847 100755 --- a/patches/Python-2.7.13/autogen.sh +++ b/patches/Python-2.7.15/autogen.sh diff --git a/patches/Python-2.7.13/series b/patches/Python-2.7.15/series index 476244734..476244734 100644 --- a/patches/Python-2.7.13/series +++ b/patches/Python-2.7.15/series |