python: add upstream patch to fix parallel building

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

12 files changed, 92 insertions, 30 deletions

diff --git a/patches/Python-2.6.6/0008-upstream-patch-to-fix-parallel-building.patch b/patches/Python-2.6.6/0008-upstream-patch-to-fix-parallel-building.patch
new file mode 100644
index 000000000..c69ae7055
--- /dev/null
+++ b/patches/Python-2.6.6/0008-upstream-patch-to-fix-parallel-building.patch
@@ -0,0 +1,61 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Wed, 23 Mar 2011 13:22:18 +0100
+Subject: [PATCH] upstream patch to fix parallel building
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+ # HG changeset patch
+ # User Antoine Pitrou <solipsis@pitrou.net>
+ # Date 1294081892 0
+ # Node ID 78de3a7fb89634e296bc2574a5d2a5411e3bb2e6
+ # Parent  b0b4414c0bdc21de4365247888087dd7311f609d
+ Merged revisions 84068,87558 via svnmerge from
+ svn+ssh://pythondev@svn.python.org/python/branches/py3k
+
+........
+  r84068 | martin.v.loewis | 2010-08-15 17:47:25 +0200 (dim., 15 août 2010) | 2 lines
+
+  Don't run pgen twice when using make -j.
+........
+  r87558 | victor.stinner | 2010-12-29 00:14:17 +0100 (mer., 29 déc. 2010) | 1 line
+
+  Don't ignore pgen error (on "make Parser/pgen.stamp")
+........
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ Makefile.pre.in |    9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.pre.in b/Makefile.pre.in
+index f8a8d36..8b1e44b 100644
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -515,9 +515,12 @@ Modules/python.o: $(srcdir)/Modules/python.c
+ 	$(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
+ 
+ 
+-$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(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)
+ 		-@$(INSTALL) -d Include
+-		-$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
++		$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C)
++		-touch Parser/pgen.stamp
+ 
+ $(PGEN):	$(PGENOBJS)
+ 		$(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN)
+@@ -1149,7 +1152,7 @@ profile-removal:
+ 
+ clobber: clean profile-removal
+ 	-rm -f $(BUILDPYTHON) $(PGEN) $(LIBRARY) $(LDLIBRARY) $(DLLLIBRARY) \
+-		tags TAGS \
++		tags TAGS Parser/pgen.stamp \
+ 		config.cache config.log pyconfig.h Modules/config.c
+ 	-rm -rf build platform
+ 	-rm -rf $(PYTHONFRAMEWORKDIR)
+-- 
+1.7.2.3
+
diff --git a/patches/Python-2.6.6/0008-use-PGEN_FOR_BUILD.patch b/patches/Python-2.6.6/0009-use-PGEN_FOR_BUILD.patch
index 30ec4df0d..ff1517cdc 100644
--- a/patches/Python-2.6.6/0008-use-PGEN_FOR_BUILD.patch
+++ b/patches/Python-2.6.6/0009-use-PGEN_FOR_BUILD.patch
@@ -8,7 +8,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  1 files changed, 3 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index f8a8d36..01d4c98 100644
+index 8b1e44b..703c6aa 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -205,6 +205,7 @@ GRAMMAR_INPUT=	$(srcdir)/Grammar/Grammar
@@ -19,18 +19,18 @@ index f8a8d36..01d4c98 100644
  
  POBJS=		\
  		Parser/acceler.o \
-@@ -515,9 +516,9 @@ Modules/python.o: $(srcdir)/Modules/python.c
- 	$(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c
+@@ -517,9 +518,9 @@ Modules/python.o: $(srcdir)/Modules/python.c
  
- 
--$(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)
 -- 
 1.7.2.3
 
diff --git a/patches/Python-2.6.6/0009-introduce-and-use-PYTHON_FOR_BUILD.patch b/patches/Python-2.6.6/0010-introduce-and-use-PYTHON_FOR_BUILD.patch
index de89a98dd..62a9ccc16 100644
--- a/patches/Python-2.6.6/0009-introduce-and-use-PYTHON_FOR_BUILD.patch
+++ b/patches/Python-2.6.6/0010-introduce-and-use-PYTHON_FOR_BUILD.patch
@@ -14,7 +14,7 @@ Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  2 files changed, 36 insertions(+), 19 deletions(-)
 
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 01d4c98..4031505 100644
+index 703c6aa..78e9a60 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -174,7 +174,8 @@ LIBOBJS=	@LIBOBJS@
@@ -57,7 +57,7 @@ index 01d4c98..4031505 100644
  	esac
  
  # Build static library
-@@ -677,7 +678,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS)
+@@ -680,7 +681,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS)
  
  TESTOPTS=	-l $(EXTRATESTOPTS)
  TESTPROG=	$(srcdir)/Lib/test/regrtest.py
@@ -66,7 +66,7 @@ index 01d4c98..4031505 100644
  test:		all platform
  		-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
  		-$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
-@@ -700,7 +701,7 @@ testuniversal:	all platform
+@@ -703,7 +704,7 @@ testuniversal:	all platform
  		-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
  		-$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS)
  		$(TESTPYTHON) $(TESTPROG) -uall $(TESTOPTS)
@@ -75,7 +75,7 @@ index 01d4c98..4031505 100644
  
  
  # Like testall, but with a single pass only
-@@ -888,23 +889,23 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
+@@ -891,23 +892,23 @@ libinstall:	build_all $(srcdir)/Lib/$(PLATDIR)
  	done
  	$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
  	PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
@@ -104,7 +104,7 @@ index 01d4c98..4031505 100644
  
  # Create the PLATDIR source directory, if one wasn't distributed..
  $(srcdir)/Lib/$(PLATDIR):
-@@ -1002,7 +1003,7 @@ libainstall:	all
+@@ -1005,7 +1006,7 @@ libainstall:	all
  # Install the dynamically loadable modules
  # This goes into $(exec_prefix)
  sharedinstall:
@@ -113,7 +113,7 @@ index 01d4c98..4031505 100644
  	   	--prefix=$(prefix) \
  		--install-scripts=$(BINDIR) \
  		--install-platlib=$(DESTSHARED) \
-@@ -1040,7 +1041,7 @@ frameworkinstallstructure:	$(LDLIBRARY)
+@@ -1043,7 +1044,7 @@ frameworkinstallstructure:	$(LDLIBRARY)
  		fi; \
  	done
  	$(LN) -fsn include/python$(VERSION) $(DESTDIR)$(prefix)/Headers
@@ -122,7 +122,7 @@ index 01d4c98..4031505 100644
  	$(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
  	$(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK)
  	$(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
-@@ -1083,7 +1084,7 @@ frameworkinstallextras:
+@@ -1086,7 +1087,7 @@ frameworkinstallextras:
  # This installs a few of the useful scripts in Tools/scripts
  scriptsinstall:
  	SRCDIR=$(srcdir) $(RUNSHARED) \
@@ -131,7 +131,7 @@ index 01d4c98..4031505 100644
  	--prefix=$(prefix) \
  	--install-scripts=$(BINDIR) \
  	--root=/$(DESTDIR)
-@@ -1105,7 +1106,7 @@ config.status:	$(srcdir)/configure
+@@ -1108,7 +1109,7 @@ config.status:	$(srcdir)/configure
  
  # Run reindent on the library
  reindent:
@@ -140,7 +140,7 @@ index 01d4c98..4031505 100644
  
  # Rerun configure with the same options as it was run last time,
  # provided the config.status script exists
-@@ -1203,7 +1204,7 @@ funny:
+@@ -1206,7 +1207,7 @@ funny:
  
  # Perform some verification checks on any modified files.
  patchcheck:
diff --git a/patches/Python-2.6.6/0010-distutils-introduce-and-use-EXECUTABLE_DIRNAME.patch b/patches/Python-2.6.6/0011-distutils-introduce-and-use-EXECUTABLE_DIRNAME.patch
index 6ac90d245..6ac90d245 100644
--- a/patches/Python-2.6.6/0010-distutils-introduce-and-use-EXECUTABLE_DIRNAME.patch
+++ b/patches/Python-2.6.6/0011-distutils-introduce-and-use-EXECUTABLE_DIRNAME.patch
diff --git a/patches/Python-2.6.6/0011-setup.py-don-t-leak-host-path-into-cross-compilation.patch b/patches/Python-2.6.6/0012-setup.py-don-t-leak-host-path-into-cross-compilation.patch
index 8788de6f4..8788de6f4 100644
--- a/patches/Python-2.6.6/0011-setup.py-don-t-leak-host-path-into-cross-compilation.patch
+++ b/patches/Python-2.6.6/0012-setup.py-don-t-leak-host-path-into-cross-compilation.patch
diff --git a/patches/Python-2.6.6/0012-setup.py-skip-import-check-while-cross-compiling.patch b/patches/Python-2.6.6/0013-setup.py-skip-import-check-while-cross-compiling.patch
index 5f50b1f95..5f50b1f95 100644
--- a/patches/Python-2.6.6/0012-setup.py-skip-import-check-while-cross-compiling.patch
+++ b/patches/Python-2.6.6/0013-setup.py-skip-import-check-while-cross-compiling.patch
diff --git a/patches/Python-2.6.6/0013-add-cross-compilation-support.patch b/patches/Python-2.6.6/0014-add-cross-compilation-support.patch
index 985df6489..3f8d22d5b 100644
--- a/patches/Python-2.6.6/0013-add-cross-compilation-support.patch
+++ b/patches/Python-2.6.6/0014-add-cross-compilation-support.patch
@@ -36,7 +36,7 @@ index 83af687..f583381 100644
  # Path to the base directory of the project. On Windows the binary may
  # live in project/PCBuild9.  If we're dealing with an x64 Windows build,
 diff --git a/Makefile.pre.in b/Makefile.pre.in
-index 4031505..2bc3f38 100644
+index 78e9a60..8b6a6b4 100644
 --- a/Makefile.pre.in
 +++ b/Makefile.pre.in
 @@ -72,6 +72,10 @@ CFLAGSFORSHARED=@CFLAGSFORSHARED@
diff --git a/patches/Python-2.6.6/0014-provide-wrapper-for-cross-python.patch b/patches/Python-2.6.6/0015-provide-wrapper-for-cross-python.patch
index 614a83be2..614a83be2 100644
--- a/patches/Python-2.6.6/0014-provide-wrapper-for-cross-python.patch
+++ b/patches/Python-2.6.6/0015-provide-wrapper-for-cross-python.patch
diff --git a/patches/Python-2.6.6/0015-0017-fix-for-new-autoconf.diff.patch b/patches/Python-2.6.6/0016-0017-fix-for-new-autoconf.diff.patch
index 127a94d4e..127a94d4e 100644
--- a/patches/Python-2.6.6/0015-0017-fix-for-new-autoconf.diff.patch
+++ b/patches/Python-2.6.6/0016-0017-fix-for-new-autoconf.diff.patch
diff --git a/patches/Python-2.6.6/0016-0018-dont-add-rpaths.diff.patch b/patches/Python-2.6.6/0017-0018-dont-add-rpaths.diff.patch
index 08cd8c1e9..08cd8c1e9 100644
--- a/patches/Python-2.6.6/0016-0018-dont-add-rpaths.diff.patch
+++ b/patches/Python-2.6.6/0017-0018-dont-add-rpaths.diff.patch
diff --git a/patches/Python-2.6.6/0017-assume-non-buggy-getaddrinfo-when-cross-compiling.patch b/patches/Python-2.6.6/0018-assume-non-buggy-getaddrinfo-when-cross-compiling.patch
index 1b012ae6e..1b012ae6e 100644
--- a/patches/Python-2.6.6/0017-assume-non-buggy-getaddrinfo-when-cross-compiling.patch
+++ b/patches/Python-2.6.6/0018-assume-non-buggy-getaddrinfo-when-cross-compiling.patch
diff --git a/patches/Python-2.6.6/series b/patches/Python-2.6.6/series
index c99720e28..15e1c51f4 100644
--- a/patches/Python-2.6.6/series
+++ b/patches/Python-2.6.6/series
@@ -6,14 +6,15 @@
 0005-use-AC_TYPE_LONG_DOUBLE-to-detect-long-double-suppor.patch
 0006-use-AC_CHECK_SIZEOF-rather-than-handcrafted-test-wit.patch
 0007-fix-silent-flag.patch
-0008-use-PGEN_FOR_BUILD.patch
-0009-introduce-and-use-PYTHON_FOR_BUILD.patch
-0010-distutils-introduce-and-use-EXECUTABLE_DIRNAME.patch
-0011-setup.py-don-t-leak-host-path-into-cross-compilation.patch
-0012-setup.py-skip-import-check-while-cross-compiling.patch
-0013-add-cross-compilation-support.patch
-0014-provide-wrapper-for-cross-python.patch
-0015-0017-fix-for-new-autoconf.diff.patch
-0016-0018-dont-add-rpaths.diff.patch
-0017-assume-non-buggy-getaddrinfo-when-cross-compiling.patch
-# af3d1249cd85718d1faf28b107c2d3df  - git-ptx-patches magic
+0008-upstream-patch-to-fix-parallel-building.patch
+0009-use-PGEN_FOR_BUILD.patch
+0010-introduce-and-use-PYTHON_FOR_BUILD.patch
+0011-distutils-introduce-and-use-EXECUTABLE_DIRNAME.patch
+0012-setup.py-don-t-leak-host-path-into-cross-compilation.patch
+0013-setup.py-skip-import-check-while-cross-compiling.patch
+0014-add-cross-compilation-support.patch
+0015-provide-wrapper-for-cross-python.patch
+0016-0017-fix-for-new-autoconf.diff.patch
+0017-0018-dont-add-rpaths.diff.patch
+0018-assume-non-buggy-getaddrinfo-when-cross-compiling.patch
+# 853a308c279b1f259b3f824528f4086a  - git-ptx-patches magic