Commit 4d9ae3da authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

python: bump to Python 2.7.7 



Status of patches:

 - python-013-fix-readline-6.3.patch is removed, as it was a backport
   from an upstream fix.
 - all other patches are updated, with no special changes other than
   solving minor conflicts.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent e5573e72

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

+3 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ Index: b/Makefile.pre.in 
 

 # Build the shared modules

 # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for

@@ -965,7 +968,7 @@

@@ -969,7 +972,7 @@

 		else	true; \

 		fi; \

 	done
@@ -40,7 +40,7 @@ Index: b/Makefile.pre.in 
 	do \

 		if test -x $$i; then \

 			$(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \

@@ -975,6 +978,11 @@

@@ -979,6 +982,11 @@

 			echo $(INSTALL_DATA) $$i $(LIBDEST); \

 		fi; \

 	done
@@ -52,7 +52,7 @@ Index: b/Makefile.pre.in 
 	@for d in $(LIBSUBDIRS); \

 	do \

 		a=$(srcdir)/Lib/$$d; \

@@ -1299,7 +1307,7 @@

@@ -1303,7 +1311,7 @@

 		Modules/Setup Modules/Setup.local Modules/Setup.config \

 		Modules/ld_so_aix Modules/python.exp Misc/python.pc

 	-rm -f python*-gdb.py

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

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Index: b/Makefile.pre.in 
===================================================================

--- a/Makefile.pre.in

+++ b/Makefile.pre.in

@@ -1013,24 +1013,32 @@

@@ -1017,24 +1017,32 @@

 		$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \

 			$(DESTDIR)$(LIBDEST)/distutils/tests ; \

 	fi

package/python/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

@@ -3337,7 +3337,7 @@

@@ -3330,7 +3330,7 @@

 

 AC_MSG_RESULT($ac_cv_buggy_getaddrinfo)

package/python/python-007-disable-extensions.patch

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ Index: b/Makefile.pre.in 
 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build

 

 # Build static library

@@ -1154,7 +1157,8 @@

@@ -1158,7 +1161,8 @@

 # Install the dynamically loadable modules

 # This goes into $(exec_prefix)

 sharedinstall: sharedmods
@@ -33,7 +33,7 @@ Index: b/configure.ac 
===================================================================

--- a/configure.ac

+++ b/configure.ac

@@ -2275,6 +2275,8 @@

@@ -2268,6 +2268,8 @@

 

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

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

+21 −18
Original line number Diff line number Diff line
@@ -6,10 +6,11 @@ on the sysconfig import that usually leads to bad data/results. 


Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>



diff -Nura Python-2.7.6.orig/configure.ac Python-2.7.6/configure.ac

--- Python-2.7.6.orig/configure.ac	2014-02-25 12:48:16.726535439 -0300

+++ Python-2.7.6/configure.ac	2014-02-25 12:49:00.992176462 -0300

@@ -868,6 +868,7 @@

Index: b/configure.ac

===================================================================

--- a/configure.ac

+++ b/configure.ac

@@ -879,6 +879,7 @@

 

 # Other platforms follow

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

   case $ac_sys_system in

     BeOS*)

@@ -928,6 +929,7 @@

@@ -939,6 +940,7 @@

 

   esac

 else # shared is disabled
@@ -25,7 +26,7 @@ diff -Nura Python-2.7.6.orig/configure.ac Python-2.7.6/configure.ac 
   case $ac_sys_system in

     CYGWIN*)

           BLDLIBRARY='$(LIBRARY)'

@@ -1905,6 +1907,9 @@

@@ -1909,6 +1911,9 @@

 AC_SUBST(BLDSHARED)

 AC_SUBST(CCSHARED)

 AC_SUBST(LINKFORSHARED)
@@ -35,7 +36,7 @@ diff -Nura Python-2.7.6.orig/configure.ac Python-2.7.6/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)

@@ -4529,7 +4534,7 @@

@@ -4550,7 +4555,7 @@

 AC_MSG_RESULT(done)

 

 # generate output files
@@ -44,10 +45,11 @@ diff -Nura Python-2.7.6.orig/configure.ac Python-2.7.6/configure.ac 
 AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])

 AC_OUTPUT

 

diff -Nura Python-2.7.6.orig/Makefile.pre.in Python-2.7.6/Makefile.pre.in

--- Python-2.7.6.orig/Makefile.pre.in	2014-02-25 12:48:16.611533773 -0300

+++ Python-2.7.6/Makefile.pre.in	2014-02-25 12:49:00.993176482 -0300

@@ -161,7 +161,7 @@

Index: b/Makefile.pre.in

===================================================================

--- a/Makefile.pre.in

+++ b/Makefile.pre.in

@@ -163,7 +163,7 @@

 SUBDIRSTOO=	Include Lib Misc Demo

 

 # Files and directories to be distributed
@@ -56,7 +58,7 @@ diff -Nura Python-2.7.6.orig/Makefile.pre.in Python-2.7.6/Makefile.pre.in 
 DISTFILES=	README ChangeLog $(CONFIGFILES)

 DISTDIRS=	$(SUBDIRS) $(SUBDIRSTOO) Ext-dummy

 DIST=		$(DISTFILES) $(DISTDIRS)

@@ -405,7 +405,7 @@

@@ -407,7 +407,7 @@

 

 # Default target

 all:		build_all
@@ -65,7 +67,7 @@ diff -Nura Python-2.7.6.orig/Makefile.pre.in Python-2.7.6/Makefile.pre.in 
 

 # Compile a binary with gcc profile guided optimization.

 profile-opt:

@@ -1045,10 +1045,12 @@

@@ -1068,10 +1068,12 @@

 	fi; \

 	cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen
@@ -80,7 +82,7 @@ diff -Nura Python-2.7.6.orig/Makefile.pre.in Python-2.7.6/Makefile.pre.in 
 

 # Install the include files

 INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY)

@@ -1107,7 +1109,7 @@

@@ -1130,7 +1132,7 @@

 	$(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup

 	$(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh

 	$(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config
@@ -89,7 +91,7 @@ diff -Nura Python-2.7.6.orig/Makefile.pre.in Python-2.7.6/Makefile.pre.in 
 	@if [ -s Modules/python.exp -a \

 		"`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \

 		echo; echo "Installing support files for building shared extension modules on AIX:"; \

@@ -1287,6 +1289,7 @@

@@ -1311,6 +1313,7 @@

 		config.cache config.log pyconfig.h Modules/config.c

 	-rm -rf build platform

 	-rm -rf $(PYTHONFRAMEWORKDIR)
@@ -97,9 +99,10 @@ diff -Nura Python-2.7.6.orig/Makefile.pre.in Python-2.7.6/Makefile.pre.in 
 

 # Make things extra clean, before making a distribution:

 # remove all generated files, even Makefile[.pre]

diff -Nura Python-2.7.6.orig/Misc/python-config.sh.in Python-2.7.6/Misc/python-config.sh.in

--- Python-2.7.6.orig/Misc/python-config.sh.in	1969-12-31 21:00:00.000000000 -0300

+++ Python-2.7.6/Misc/python-config.sh.in	2014-02-25 12:49:00.993176482 -0300

Index: b/Misc/python-config.sh.in

===================================================================

--- /dev/null

+++ b/Misc/python-config.sh.in

@@ -0,0 +1,102 @@

+#!/bin/sh

+