Commit 7076e6f6 authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

python: bump to 2.7.10 



Patches are simply refreshed, except
004-sysconfigdata-install-location.patch where a minor conflict
resolution was needed.

[Peter: fixup .hash as pointed out by Arnout]
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Reviewed-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent d98eed32

package/python/004-sysconfigdata-install-location.patch

+2 −2
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ Index: b/configure.ac 
 	    AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])

 	fi

         AC_MSG_RESULT($interp)

-	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp

+	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pysysconfigdatadir.txt && echo $(abs_builddir)/`cat pysysconfigdatadir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/plat-$(MACHDEP) '$interp

-	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp

+	PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pysysconfigdatadir.txt && echo $(abs_builddir)/`cat pysysconfigdatadir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp

     fi

 elif test "$cross_compiling" = maybe; then

     AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])

package/python/005-pyc-pyo-conditional.patch

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ Index: b/configure.ac 
===================================================================

--- a/configure.ac

+++ b/configure.ac

@@ -736,6 +736,17 @@

@@ -739,6 +739,17 @@

     ;;

 esac

package/python/006-cross-compile-getaddrinfo.patch

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Index: b/configure.ac 
===================================================================

--- a/configure.ac

+++ b/configure.ac

@@ -3346,7 +3346,7 @@

@@ -3353,7 +3353,7 @@

 

 AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)

package/python/007-disable-extensions.patch

+2 −2
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ Index: b/configure.ac 
===================================================================

--- a/configure.ac

+++ b/configure.ac

@@ -2284,6 +2284,8 @@

@@ -2290,6 +2290,8 @@

 

 AC_PATH_TOOL([PKG_CONFIG], [pkg-config])

 PKG_PROG_PKG_CONFIG

 

+AC_SUBST(DISABLED_EXTENSIONS)

+

package/python/010-fix-python-config.patch

+4 −4
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Index: b/configure.ac 
===================================================================

--- a/configure.ac

+++ b/configure.ac

@@ -882,6 +882,7 @@

@@ -885,6 +885,7 @@

 

 # Other platforms follow

 if test $enable_shared = "yes"; then
@@ -18,7 +18,7 @@ Index: b/configure.ac 
   AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.])

   case $ac_sys_system in

     BeOS*)

@@ -942,6 +943,7 @@

@@ -945,6 +946,7 @@

 

   esac

 else # shared is disabled
@@ -26,7 +26,7 @@ Index: b/configure.ac 
   case $ac_sys_system in

     CYGWIN*)

           BLDLIBRARY='$(LIBRARY)'

@@ -1918,6 +1920,9 @@

@@ -1921,6 +1923,9 @@

 AC_SUBST(BLDSHARED)

 AC_SUBST(CCSHARED)

 AC_SUBST(LINKFORSHARED)
@@ -36,7 +36,7 @@ Index: b/configure.ac 
 # SO is the extension of shared libraries `(including the dot!)

 # -- usually .so, .sl on HP-UX, .dll on Cygwin

 AC_MSG_CHECKING(SO)

@@ -4581,7 +4586,7 @@

@@ -4588,7 +4593,7 @@

 AC_SUBST(ENSUREPIP)

 

 # generate output files