python: version bump 2.7.9 -> 2.7.13

Cleanup configure options while at it and use system libraries.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

13 files changed, 66 insertions, 91 deletions

diff --git a/patches/Python-2.7.9/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch b/patches/Python-2.7.13/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch
index 0994ad2b5..7004b406f 100644
--- a/patches/Python-2.7.9/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch
+++ b/patches/Python-2.7.13/0001-Add-support-for-socketcan-to-the-python-socket-modul.patch
@@ -35,10 +35,10 @@ index ad307f65398b..f72ae886cad8 100644
  AF_MAX = PF_MAX
  SOL_RAW = 255
 diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
-index e9e4479a6678..bddf4ba7782e 100644
+index 3e3c05f54079..0deb827e1925 100644
 --- a/Modules/socketmodule.c
 +++ b/Modules/socketmodule.c
-@@ -424,6 +424,10 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
+@@ -448,6 +448,10 @@ const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
  
  #define SAS2SA(x)       ((struct sockaddr *)(x))
  
@@ -49,7 +49,7 @@ index e9e4479a6678..bddf4ba7782e 100644
  /*
   * Constants for getnameinfo()
   */
-@@ -1101,6 +1105,22 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen, int proto)
+@@ -1125,6 +1129,22 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen, int proto)
      }
  #endif
  
@@ -72,7 +72,7 @@ index e9e4479a6678..bddf4ba7782e 100644
  #ifdef USE_BLUETOOTH
      case AF_BLUETOOTH:
          switch (proto) {
-@@ -1387,6 +1407,28 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
+@@ -1411,6 +1431,28 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args,
      }
  #endif
  
@@ -101,7 +101,7 @@ index e9e4479a6678..bddf4ba7782e 100644
  #ifdef USE_BLUETOOTH
      case AF_BLUETOOTH:
      {
-@@ -1637,6 +1679,14 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
+@@ -1662,6 +1704,14 @@ getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
      }
  #endif
  
@@ -116,7 +116,7 @@ index e9e4479a6678..bddf4ba7782e 100644
  #ifdef USE_BLUETOOTH
      case AF_BLUETOOTH:
      {
-@@ -4771,6 +4821,10 @@ init_socket(void)
+@@ -4798,6 +4848,10 @@ init_socket(void)
      PyModule_AddIntConstant(m, "AF_LLC", AF_LLC);
  #endif
  
@@ -127,7 +127,7 @@ index e9e4479a6678..bddf4ba7782e 100644
  #ifdef USE_BLUETOOTH
      PyModule_AddIntConstant(m, "AF_BLUETOOTH", AF_BLUETOOTH);
      PyModule_AddIntConstant(m, "BTPROTO_L2CAP", BTPROTO_L2CAP);
-@@ -5127,6 +5181,41 @@ init_socket(void)
+@@ -5154,6 +5208,41 @@ init_socket(void)
      PyModule_AddIntConstant(m, "IPPROTO_MAX", IPPROTO_MAX);
  #endif
  
@@ -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 94a215e0cf07..3e9186c84cb6 100644
+index 127346502c3b..e56d674f60da 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1542,6 +1542,19 @@ AC_CHECK_HEADERS(linux/netlink.h,,,[
+@@ -1720,6 +1720,19 @@ AC_CHECK_HEADERS(linux/netlink.h,,,[
  #endif
  ])
  
diff --git a/patches/Python-2.7.9/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch b/patches/Python-2.7.13/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch
index 97781a553..21f8e9b21 100644
--- a/patches/Python-2.7.9/0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch
+++ b/patches/Python-2.7.13/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 3e9186c84cb6..34949fe34037 100644
+index e56d674f60da..f7ea172c61bc 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1679,15 +1679,11 @@ AC_CHECK_SIZEOF(fpos_t, 4)
+@@ -1857,15 +1857,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.9/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch b/patches/Python-2.7.13/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch
index 57d2c2feb..e4a45398b 100644
--- a/patches/Python-2.7.9/0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch
+++ b/patches/Python-2.7.13/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 34949fe34037..9f9153fd8f75 100644
+index f7ea172c61bc..d14c74bb700b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1686,16 +1686,8 @@ if test "$ac_cv_type_long_long_int" = "yes" ; then
+@@ -1864,16 +1864,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.9/0005-setup.py-don-t-leak-host-path-into-cross-compilation.patch b/patches/Python-2.7.13/0004-setup.py-don-t-leak-host-path-into-cross-compilation.patch
index c29acee0b..ef35a68d4 100644
--- a/patches/Python-2.7.9/0005-setup.py-don-t-leak-host-path-into-cross-compilation.patch
+++ b/patches/Python-2.7.13/0004-setup.py-don-t-leak-host-path-into-cross-compilation.patch
@@ -12,10 +12,10 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 file changed, 3 insertions(+)
 
 diff --git a/setup.py b/setup.py
-index 7868b7b241cc..542254496552 100644
+index 54054c208a76..b2b793cf5d29 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -1208,6 +1208,9 @@ class PyBuildExt(build_ext):
+@@ -1228,6 +1228,9 @@ class PyBuildExt(build_ext):
          # the more recent berkeleydb's db.h file first in the include path
          # when attempting to compile and it will fail.
          f = "/usr/include/db.h"
diff --git a/patches/Python-2.7.9/0006-add-cross-compilation-support.patch b/patches/Python-2.7.13/0005-add-cross-compilation-support.patch
index 9e54fe5b1..116d40216 100644
--- a/patches/Python-2.7.9/0006-add-cross-compilation-support.patch
+++ b/patches/Python-2.7.13/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 df38eb5158d1..becc7182cfe6 100644
+index e28896406f6f..b404fbb9eb54 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
-@@ -84,6 +84,10 @@ CFLAGSFORSHARED=@CFLAGSFORSHARED@
+@@ -89,6 +89,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 df38eb5158d1..becc7182cfe6 100644
  
  # Machine-dependent subdirectories
  MACHDEP=	@MACHDEP@
-@@ -102,11 +106,11 @@ datarootdir=    @datarootdir@
+@@ -107,11 +111,11 @@ datarootdir=    @datarootdir@
  
  # Expanded directories
  BINDIR=		@bindir@
@@ -42,10 +42,10 @@ index df38eb5158d1..becc7182cfe6 100644
  # Detailed destination directories
  BINLIBDEST=	$(LIBDIR)/python$(VERSION)
 diff --git a/configure.ac b/configure.ac
-index 9f9153fd8f75..9ad2468ed32c 100644
+index d14c74bb700b..6631dc233528 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -943,6 +943,13 @@ if test "$cross_compiling" = yes; then
+@@ -966,6 +966,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.13/0006-python-don-t-add-rpaths-in-setup.py.patch
new file mode 100644
index 000000000..d8d150737
--- /dev/null
+++ b/patches/Python-2.7.13/0006-python-don-t-add-rpaths-in-setup.py.patch
@@ -0,0 +1,31 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Sat, 27 May 2017 08:00:24 +0200
+Subject: [PATCH] python: don't add rpaths in setup.py
+
+We don't add rpaths.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ setup.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index b2b793cf5d29..d761cbd29365 100644
+--- a/setup.py
++++ b/setup.py
+@@ -1101,7 +1101,6 @@ class PyBuildExt(build_ext):
+             exts.append(Extension('_bsddb', ['_bsddb.c'],
+                                   depends = ['bsddb.h'],
+                                   library_dirs=dblib_dir,
+-                                  runtime_library_dirs=dblib_dir,
+                                   include_dirs=db_incs,
+                                   libraries=dblibs))
+         else:
+@@ -1318,7 +1317,6 @@ class PyBuildExt(build_ext):
+                         print "building dbm using bdb"
+                         dbmext = Extension('dbm', ['dbmmodule.c'],
+                                            library_dirs=dblib_dir,
+-                                           runtime_library_dirs=dblib_dir,
+                                            include_dirs=db_incs,
+                                            define_macros=[
+                                                ('HAVE_BERKDB_H', None),
diff --git a/patches/Python-2.7.9/0008-add-more-search-paths.patch b/patches/Python-2.7.13/0007-add-more-search-paths.patch
index fdf2217ec..559a57955 100644
--- a/patches/Python-2.7.9/0008-add-more-search-paths.patch
+++ b/patches/Python-2.7.13/0007-add-more-search-paths.patch
@@ -10,10 +10,10 @@ 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 f59ad7acd5cc..7f6702be3151 100644
+index d761cbd29365..8873831323f0 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -486,8 +486,10 @@ class PyBuildExt(build_ext):
+@@ -502,8 +502,10 @@ class PyBuildExt(build_ext):
              # (PYTHONFRAMEWORK is set) to avoid # linking problems when
              # building a framework with different architectures than
              # the one that is currently installed (issue #7473)
diff --git a/patches/Python-2.7.9/0009-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch b/patches/Python-2.7.13/0008-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch
index a90370ee6..91ec308c6 100644
--- a/patches/Python-2.7.9/0009-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch
+++ b/patches/Python-2.7.13/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 9ad2468ed32c..6b8f436bb34b 100644
+index 6631dc233528..669624d53735 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -889,7 +889,7 @@ if test $enable_shared = "yes"; then
+@@ -912,7 +912,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.9/autogen.sh b/patches/Python-2.7.13/autogen.sh
index 903ce7847..903ce7847 100755
--- a/patches/Python-2.7.9/autogen.sh
+++ b/patches/Python-2.7.13/autogen.sh
diff --git a/patches/Python-2.7.13/series b/patches/Python-2.7.13/series
new file mode 100644
index 000000000..3a8265888
--- /dev/null
+++ b/patches/Python-2.7.13/series
@@ -0,0 +1,11 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Add-support-for-socketcan-to-the-python-socket-modul.patch
+0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch
+0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch
+0004-setup.py-don-t-leak-host-path-into-cross-compilation.patch
+0005-add-cross-compilation-support.patch
+0006-python-don-t-add-rpaths-in-setup.py.patch
+0007-add-more-search-paths.patch
+0008-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch
+# 9497b574212cc870e4c8fce4dd1b0b44  - git-ptx-patches magic
diff --git a/patches/Python-2.7.9/0004-use-PGEN_FOR_BUILD.patch b/patches/Python-2.7.9/0004-use-PGEN_FOR_BUILD.patch
deleted file mode 100644
index 1194e88e0..000000000
--- a/patches/Python-2.7.9/0004-use-PGEN_FOR_BUILD.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Marc Kleine-Budde <mkl@pengutronix.de>
-Date: Wed, 12 Jun 2013 13:53:15 +0200
-Subject: [PATCH] use PGEN_FOR_BUILD
-
-Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- Makefile.pre.in | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 7f4ec2f55e7f..df38eb5158d1 100644
---- a/Makefile.pre.in
-+++ b/Makefile.pre.in
-@@ -234,6 +234,8 @@ LIBFFI_INCLUDEDIR=	@LIBFFI_INCLUDEDIR@
- ##########################################################################
- # Parser
- PGEN=		Parser/pgen$(EXE)
-+PGEN_FOR_BUILD=	$(PGEN)
-+
- 
- PSRCS=		\
- 		Parser/acceler.c \
-@@ -611,7 +613,7 @@ Modules/pwdmodule.o: $(srcdir)/Modules/pwdmodule.c $(srcdir)/Modules/posixmodule
- $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGENSRCS)
- 		@$(MKDIR_P) Include
- 		$(MAKE) $(PGEN)
--		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
-+		$(PGEN_FOR_BUILD) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
- $(GRAMMAR_C): $(GRAMMAR_H) $(GRAMMAR_INPUT) $(PGENSRCS)
- 		$(MAKE) $(GRAMMAR_H)
- 		touch $(GRAMMAR_C)
diff --git a/patches/Python-2.7.9/0007-python-don-t-add-rpaths-in-setup.py.patch b/patches/Python-2.7.9/0007-python-don-t-add-rpaths-in-setup.py.patch
deleted file mode 100644
index 18c14c72b..000000000
--- a/patches/Python-2.7.9/0007-python-don-t-add-rpaths-in-setup.py.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: unknown author <unknown.author@example.com>
-Date: Tue, 8 Feb 2011 15:10:31 +0100
-Subject: [PATCH] python: don't add rpaths in setup.py
-
-We don't add rpaths.
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- setup.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index 542254496552..f59ad7acd5cc 100644
---- a/setup.py
-+++ b/setup.py
-@@ -1081,7 +1081,6 @@ class PyBuildExt(build_ext):
-             exts.append(Extension('_bsddb', ['_bsddb.c'],
-                                   depends = ['bsddb.h'],
-                                   library_dirs=dblib_dir,
--                                  runtime_library_dirs=dblib_dir,
-                                   include_dirs=db_incs,
-                                   libraries=dblibs))
-         else:
diff --git a/patches/Python-2.7.9/series b/patches/Python-2.7.9/series
deleted file mode 100644
index 47df268f3..000000000
--- a/patches/Python-2.7.9/series
+++ /dev/null
@@ -1,12 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Add-support-for-socketcan-to-the-python-socket-modul.patch
-0002-use-AC_CHECK_SIZEOF-rather-than-AC_TRY_COMPILE-for-l.patch
-0003-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch
-0004-use-PGEN_FOR_BUILD.patch
-0005-setup.py-don-t-leak-host-path-into-cross-compilation.patch
-0006-add-cross-compilation-support.patch
-0007-python-don-t-add-rpaths-in-setup.py.patch
-0008-add-more-search-paths.patch
-0009-resolve-existing-LD_LIBRARY_PATH-during-make-not-dur.patch
-# c22b85583b9b9fc00386bba7094689ba  - git-ptx-patches magic