[Python-checkins] r87701 - in python/branches/release27-maint: Makefile.pre.in Misc/NEWS

[antoine.pitrou]

Author: antoine.pitrou
Date: Mon Jan  3 20:11:32 2011
New Revision: 87701

Log:
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")
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Makefile.pre.in
   python/branches/release27-maint/Misc/NEWS

Modified: python/branches/release27-maint/Makefile.pre.in
==============================================================================
--- python/branches/release27-maint/Makefile.pre.in	(original)
+++ python/branches/release27-maint/Makefile.pre.in	Mon Jan  3 20:11:32 2011
@@ -536,9 +536,12 @@
 	$(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)
@@ -1184,7 +1187,7 @@
 
 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)

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Mon Jan  3 20:11:32 2011
@@ -105,6 +105,8 @@
 Build
 -----
 
+- Don't run pgen twice when using make -j.
+
 - Issue #7716: Under Solaris, don't assume existence of /usr/xpg4/bin/grep in
   the configure script but use $GREP instead.  Patch by Fabian Groffen.