Commit 2455c89b authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

python: bump to 2.7.2 



This is mostly a mechanical bump, with a refresh of all the patches to
accomodate the offsets, and some minor conflict resolution.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent a21642c7

package/python/python-2.7-001-support-for-build.patch

+22 −21
Original line number Diff line number Diff line
@@ -22,11 +22,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
 configure.in    |   17 +++++++++++++++++

 2 files changed, 34 insertions(+), 15 deletions(-)



Index: Python-2.7.1/Makefile.pre.in

Index: Python-2.7.2/Makefile.pre.in

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

--- Python-2.7.1.orig/Makefile.pre.in

+++ Python-2.7.1/Makefile.pre.in

@@ -178,7 +178,8 @@

--- Python-2.7.2.orig/Makefile.pre.in

+++ Python-2.7.2/Makefile.pre.in

@@ -181,7 +181,8 @@

 UNICODE_OBJS=   @UNICODE_OBJS@

 

 PYTHON=		python$(EXE)
@@ -36,7 +36,7 @@ Index: Python-2.7.1/Makefile.pre.in 
 

 # The task to run while instrument when building the profile-opt target

 PROFILE_TASK=	$(srcdir)/Tools/pybench/pybench.py -n 2 --with-gc --with-syscheck

@@ -210,7 +211,8 @@

@@ -213,7 +214,8 @@

 

 ##########################################################################

 # Parser
@@ -46,7 +46,7 @@ Index: Python-2.7.1/Makefile.pre.in 
 

 POBJS=		\

 		Parser/acceler.o \

@@ -404,8 +406,8 @@

@@ -407,8 +409,8 @@

 # Build the shared modules

 sharedmods: $(BUILDPYTHON)

 	@case $$MAKEFLAGS in \
@@ -57,15 +57,16 @@ Index: Python-2.7.1/Makefile.pre.in 
 	esac

 

 # Build static library

@@ -536,12 +538,12 @@

 	$(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c

@@ -540,13 +542,13 @@

 

 

-$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT)

+$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN_FOR_BUILD) $(GRAMMAR_INPUT)

 # Use a stamp file to prevent make -j invoking pgen twice

 $(GRAMMAR_H) $(GRAMMAR_C): Parser/pgen.stamp

-Parser/pgen.stamp: $(PGEN) $(GRAMMAR_INPUT)

+Parser/pgen.stamp: $(PGEN_FOR_BUILD) $(GRAMMAR_INPUT)

 		-@$(INSTALL) -d Include

-		-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)

+		-$(PGEN_FOR_BUILD) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)

-		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)

+		$(PGEN_FOR_BUILD) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)

 		-touch Parser/pgen.stamp

 

-$(PGEN):	$(PGENOBJS)

-		$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
@@ -74,7 +75,7 @@ Index: Python-2.7.1/Makefile.pre.in 
 

 Parser/grammar.o:	$(srcdir)/Parser/grammar.c \

 				$(srcdir)/Include/token.h \

@@ -921,25 +923,25 @@

@@ -926,25 +928,25 @@

 	done

 	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt

 	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
@@ -105,7 +106,7 @@ Index: Python-2.7.1/Makefile.pre.in 
 

 # Create the PLATDIR source directory, if one wasn't distributed..

 $(srcdir)/Lib/$(PLATDIR):

@@ -1044,7 +1046,7 @@

@@ -1049,7 +1051,7 @@

 # Install the dynamically loadable modules

 # This goes into $(exec_prefix)

 sharedinstall: sharedmods
@@ -114,20 +115,20 @@ Index: Python-2.7.1/Makefile.pre.in 
 	   	--prefix=$(prefix) \

 		--install-scripts=$(BINDIR) \

 		--install-platlib=$(DESTSHARED) \

@@ -1183,7 +1185,7 @@

@@ -1188,7 +1190,7 @@

 	find . -name '*.gc??' -exec rm -f {} ';'

 

 clobber: clean profile-removal

-	-rm -f $(BUILDPYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \

+	-rm -f $(BUILDPYTHON) $(BUILDPGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \

 		tags TAGS \

 		tags TAGS Parser/pgen.stamp \

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

 	-rm -rf build platform

Index: Python-2.7.1/configure.in

Index: Python-2.7.2/configure.in

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

--- Python-2.7.1.orig/configure.in

+++ Python-2.7.1/configure.in

@@ -4291,6 +4291,23 @@

--- Python-2.7.2.orig/configure.in

+++ Python-2.7.2/configure.in

@@ -4305,6 +4305,23 @@

 done

 AC_MSG_RESULT(done)

package/python/python-2.7-002-cross-compile-variable.patch

+9 −9
Original line number Diff line number Diff line
@@ -15,11 +15,11 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
 configure.in    |    3 +++

 2 files changed, 6 insertions(+), 3 deletions(-)



Index: Python-2.7.1/Makefile.pre.in

Index: Python-2.7.2/Makefile.pre.in

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

--- Python-2.7.1.orig/Makefile.pre.in

+++ Python-2.7.1/Makefile.pre.in

@@ -406,8 +406,8 @@

--- Python-2.7.2.orig/Makefile.pre.in

+++ Python-2.7.2/Makefile.pre.in

@@ -409,8 +409,8 @@

 # Build the shared modules

 sharedmods: $(BUILDPYTHON)

 	@case $$MAKEFLAGS in \
@@ -30,7 +30,7 @@ Index: Python-2.7.1/Makefile.pre.in 
 	esac

 

 # Build static library

@@ -1046,7 +1046,7 @@

@@ -1051,7 +1051,7 @@

 # Install the dynamically loadable modules

 # This goes into $(exec_prefix)

 sharedinstall: sharedmods
@@ -39,11 +39,11 @@ Index: Python-2.7.1/Makefile.pre.in 
 	   	--prefix=$(prefix) \

 		--install-scripts=$(BINDIR) \

 		--install-platlib=$(DESTSHARED) \

Index: Python-2.7.1/configure.in

Index: Python-2.7.2/configure.in

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

--- Python-2.7.1.orig/configure.in

+++ Python-2.7.1/configure.in

@@ -4308,6 +4308,9 @@

--- Python-2.7.2.orig/configure.in

+++ Python-2.7.2/configure.in

@@ -4322,6 +4322,9 @@

 AC_ARG_VAR(PYTHON_FOR_BUILD,[build system Python])

 AC_ARG_VAR(PGEN_FOR_BUILD,[build system Python pgen])

package/python/python-2.7-003-no-import-when-cross-compiling.patch

+3 −3
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
 setup.py |    4 ++++

 1 file changed, 4 insertions(+)



Index: Python-2.7.1/setup.py

Index: Python-2.7.2/setup.py

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

--- Python-2.7.1.orig/setup.py

+++ Python-2.7.1/setup.py

--- Python-2.7.2.orig/setup.py

+++ Python-2.7.2/setup.py

@@ -304,6 +304,10 @@

             self.announce('WARNING: skipping import check for Cygwin-based "%s"'

                 % ext.name)

package/python/python-2.7-004-no-host-headers-libs.patch

+12 −10
Original line number Diff line number Diff line
@@ -10,23 +10,25 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> 
 setup.py |   39 +++++++++++++++++++++------------------

 1 file changed, 21 insertions(+), 18 deletions(-)



Index: Python-2.7.1/setup.py

Index: Python-2.7.2/setup.py

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

--- Python-2.7.1.orig/setup.py

+++ Python-2.7.1/setup.py

@@ -351,8 +351,9 @@

--- Python-2.7.2.orig/setup.py

+++ Python-2.7.2/setup.py

@@ -373,9 +373,10 @@

 

     def detect_modules(self):

         # Ensure that /usr/local is always used

-        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')

-        add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')

-        self.add_multiarch_paths()

+        if os.environ.get('CROSS_COMPILING') != 'yes':

+            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')

+            add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')

+            self.add_multiarch_paths()

 

         # Add paths specified in the environment variables LDFLAGS and

         # CPPFLAGS for header and library files.

@@ -360,10 +361,7 @@

@@ -383,10 +384,7 @@

         # directly since an inconsistently reproducible issue comes up where

         # the environment variable is not set even though the value were passed

         # into configure and stored in the Makefile (issue found on OS X 10.3).
@@ -38,7 +40,7 @@ Index: Python-2.7.1/setup.py 
             env_val = sysconfig.get_config_var(env_var)

             if env_val:

                 # To prevent optparse from raising an exception about any

@@ -388,17 +386,6 @@

@@ -411,17 +409,6 @@

                     for directory in reversed(options.dirs):

                         add_dir_to_list(dir_list, directory)
@@ -56,7 +58,7 @@ Index: Python-2.7.1/setup.py 
         try:

             have_unicode = unicode

         except NameError:

@@ -407,11 +394,16 @@

@@ -430,11 +417,16 @@

         # lib_dirs and inc_dirs are used to search for files;

         # if a file is found in one of those directories, it can

         # be assumed that no additional -I,-L directives are needed.
@@ -78,7 +80,7 @@ Index: Python-2.7.1/setup.py 
         exts = []

         missing = []

 

@@ -844,6 +836,9 @@

@@ -867,6 +859,9 @@

             db_inc_paths.append('/pkg/db-3.%d/include' % x)

             db_inc_paths.append('/opt/db-3.%d/include' % x)
@@ -88,7 +90,7 @@ Index: Python-2.7.1/setup.py 
         # Add some common subdirectories for Sleepycat DB to the list,

         # based on the standard include directories. This way DB3/4 gets

         # picked up when it is installed in a non-standard prefix and

@@ -996,6 +991,9 @@

@@ -1019,6 +1014,9 @@

         MIN_SQLITE_VERSION = ".".join([str(x)

                                     for x in MIN_SQLITE_VERSION_NUMBER])
@@ -98,7 +100,7 @@ Index: Python-2.7.1/setup.py 
         # Scan the default include directories before the SQLite specific

         # ones. This allows one to override the copy of sqlite on OSX,

         # where /usr/include contains an old version of sqlite.

@@ -1095,6 +1093,8 @@

@@ -1118,6 +1116,8 @@

         # 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"

package/python/python-2.7-005-staging-headers-libs.patch

+5 −5
Original line number Diff line number Diff line
@@ -12,12 +12,12 @@ Patch ported to python2.7 by Maxime Ripard <ripard@archos.com> 
 setup.py |   13 +++++++++++++

 1 file changed, 13 insertions(+)



Index: Python-2.7.1/setup.py

Index: Python-2.7.2/setup.py

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

--- Python-2.7.1.orig/setup.py

+++ Python-2.7.1/setup.py

@@ -350,6 +350,19 @@

         return sys.platform

--- Python-2.7.2.orig/setup.py

+++ Python-2.7.2/setup.py

@@ -372,6 +372,19 @@

             os.unlink(tmpfile)

 

     def detect_modules(self):

+        try: