diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2011-09-18 18:05:23 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2011-09-18 21:05:10 +0200 |
| commit | 2455c89bab315c0b6842198f16777585029e364f (patch) | |
| tree | 721daabcba459ded2c463c31a7a118a358c29fc4 /package/python/python-2.7-001-support-for-build.patch | |
| parent | a21642c7eb06eeffe621e7eaef1a85cb9b4589f8 (diff) | |
| download | buildroot-novena-2455c89bab315c0b6842198f16777585029e364f.tar.gz buildroot-novena-2455c89bab315c0b6842198f16777585029e364f.zip | |
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/python/python-2.7-001-support-for-build.patch')
| -rw-r--r-- | package/python/python-2.7-001-support-for-build.patch | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/package/python/python-2.7-001-support-for-build.patch b/package/python/python-2.7-001-support-for-build.patch index 2795e65f3..b0430a4ef 100644 --- a/package/python/python-2.7-001-support-for-build.patch +++ b/package/python/python-2.7-001-support-for-build.patch @@ -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) |