Fix a MAKE_JOBS safety problem. In the recipe for Python/importlib.h it

launches a submake for _freeze_importlib before all the object files have
been compiled. List $(LIBRARY_OBJS_OMIT_FROZEN) as dependencies to make it
wait until it is safe to launch the submake.

Should fix occasional errors of the sort:
Python/Python-ast.o: file not recognized: File truncated
*** [Modules/_freeze_importlib] Error code 1

5 files changed, 32 insertions, 16 deletions

diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index 9095b4a2707..a69636f7bc0 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2015/01/11 14:07:48 bsiegert Exp $
+# $NetBSD: Makefile,v 1.30 2015/03/16 13:53:05 tnn Exp $
 
 .include "dist.mk"
 
@@ -30,8 +30,6 @@ PKGCONFIG_OVERRIDE+=	Misc/python.pc.in
 
 USE_LANGUAGES=		c c++
 
-MAKE_JOBS_SAFE=		no
-
 PTHREAD_OPTS+=	require
 .include "../../mk/pthread.buildlink3.mk"
 
diff --git a/lang/python33/distinfo b/lang/python33/distinfo
index 0000ae506f6..c6fd1c5e231 100644
--- a/lang/python33/distinfo
+++ b/lang/python33/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2015/01/22 11:09:18 sevan Exp $
+$NetBSD: distinfo,v 1.21 2015/03/16 13:53:05 tnn Exp $
 
 SHA1 (Python-3.3.6.tar.xz) = 0a86ae9e877467a62faed7ece208c0d6899b0991
 RMD160 (Python-3.3.6.tar.xz) = e45909eedf3648408ef8b34775ab24654181d9bd
@@ -10,7 +10,7 @@ SHA1 (patch-ab) = 1c0a25bf7ec6ee76e84c799619ec7cd8910f16e1
 SHA1 (patch-ah) = bb43aaab260935a5a0d5e7ce1ccc30f4832cab1d
 SHA1 (patch-am) = ae28f14398c08f114c6b11f528a9e5eda90f003b
 SHA1 (patch-an) = f497bc50789c957ee93b3e91f65cb8cd4f236d9b
-SHA1 (patch-au) = c892f1004eb32e9608f93c08ec6f94e16bdca182
+SHA1 (patch-au) = c466c257fcb7c282e93073122df1db4c5dc57f09
 SHA1 (patch-av) = 9b44f339f65f029b7f17dbc654739a7ae3c12780
 SHA1 (patch-aw) = c47387f377faad6b12d688ae5d56fec1298fcce7
 SHA1 (patch-configure) = 695e024b5dd590ca4987704e4b812489b9a8daab
diff --git a/lang/python33/patches/patch-au b/lang/python33/patches/patch-au
index abf1b00af1b..933fdbd9990 100644
--- a/lang/python33/patches/patch-au
+++ b/lang/python33/patches/patch-au
@@ -1,6 +1,6 @@
-$NetBSD: patch-au,v 1.2 2013/05/26 17:56:09 wiz Exp $
+$NetBSD: patch-au,v 1.3 2015/03/16 13:53:05 tnn Exp $
 
---- Makefile.pre.in.orig	2013-05-15 16:32:57.000000000 +0000
+--- Makefile.pre.in.orig	2014-10-12 07:03:53.000000000 +0000
 +++ Makefile.pre.in
 @@ -81,7 +81,7 @@ PY_CFLAGS=	$(BASECFLAGS) $(OPT) $(CONFIG
  # be able to build extension modules using the directories specified in the
@@ -11,7 +11,16 @@ $NetBSD: patch-au,v 1.2 2013/05/26 17:56:09 wiz Exp $
  NO_AS_NEEDED=	@NO_AS_NEEDED@
  LDLAST=		@LDLAST@
  SGI_ABI=	@SGI_ABI@
-@@ -744,7 +744,7 @@ Objects/setobject.o: $(srcdir)/Objects/s
+@@ -610,7 +610,7 @@ Modules/_testembed: Modules/_testembed.o
+ Modules/_freeze_importlib: Modules/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN)
+ 	$(LINKCC) $(PY_LDFLAGS) -o $@ Modules/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 
+-Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Modules/_freeze_importlib.c
++Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Modules/_freeze_importlib.c $(LIBRARY_OBJS_OMIT_FROZEN)
+ 	$(MAKE) Modules/_freeze_importlib
+ 	./Modules/_freeze_importlib \
+ 		$(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h
+@@ -749,7 +749,7 @@ Objects/setobject.o: $(srcdir)/Objects/s
  $(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES)
  	$(OPCODETARGETGEN) $(OPCODETARGETS_H)
  
@@ -20,7 +29,7 @@ $NetBSD: patch-au,v 1.2 2013/05/26 17:56:09 wiz Exp $
  
  Python/formatter_unicode.o: $(srcdir)/Python/formatter_unicode.c \
  				$(BYTESTR_DEPS)
-@@ -957,7 +957,8 @@ altbininstall: $(BUILDPYTHON)
+@@ -963,7 +963,8 @@ altbininstall: $(BUILDPYTHON)
  		if test -n "$(PY3LIBRARY)"; then \
  			$(INSTALL_SHARED) $(PY3LIBRARY) $(DESTDIR)$(LIBDIR)/$(PY3LIBRARY); \
  		fi; \
diff --git a/lang/python34/distinfo b/lang/python34/distinfo
index 1e7f1b71e17..287224ad48d 100644
--- a/lang/python34/distinfo
+++ b/lang/python34/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2015/02/26 06:23:06 adam Exp $
+$NetBSD: distinfo,v 1.17 2015/03/16 13:53:05 tnn Exp $
 
 SHA1 (Python-3.4.3.tar.xz) = 7ca5cd664598bea96eec105aa6453223bb6b4456
 RMD160 (Python-3.4.3.tar.xz) = fc0a8ce58c8b354f644db3527d838a77d2e27fba
@@ -9,7 +9,7 @@ SHA1 (patch-ah) = 1c4eec742ab26f77c6326b7d12e44e26be493c0f
 SHA1 (patch-al) = 7239d10b67c739c3ee33dd2fc95bb770360d152f
 SHA1 (patch-am) = 1752a06fec7626af57e85b6cbd9b6cc38b99272f
 SHA1 (patch-an) = c9b571eb54fdf0b1e93524a6de6780e8c4119221
-SHA1 (patch-au) = 6e10e6fc484317447bdeaa833db5df073df98c5b
+SHA1 (patch-au) = b593d64b34531fdd5a936d109854d80e969f1847
 SHA1 (patch-av) = 9b44f339f65f029b7f17dbc654739a7ae3c12780
 SHA1 (patch-aw) = bd290417c265846e238660180e60e76c0f5f696a
 SHA1 (patch-xa) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
diff --git a/lang/python34/patches/patch-au b/lang/python34/patches/patch-au
index ddc3422b053..8d6260b3434 100644
--- a/lang/python34/patches/patch-au
+++ b/lang/python34/patches/patch-au
@@ -1,8 +1,8 @@
-$NetBSD: patch-au,v 1.1 2014/05/09 02:27:14 wen Exp $
+$NetBSD: patch-au,v 1.2 2015/03/16 13:53:05 tnn Exp $
 
---- Makefile.pre.in.orig	2014-05-04 20:07:49.000000000 +0000
+--- Makefile.pre.in.orig	2015-02-25 11:27:45.000000000 +0000
 +++ Makefile.pre.in
-@@ -81,7 +81,7 @@ PY_CFLAGS=	$(BASECFLAGS) $(OPT) $(CONFIG
+@@ -86,7 +86,7 @@ PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODI
  # be able to build extension modules using the directories specified in the
  # environment variables
  PY_CPPFLAGS=	$(BASECPPFLAGS) -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
@@ -11,7 +11,16 @@ $NetBSD: patch-au,v 1.1 2014/05/09 02:27:14 wen Exp $
  NO_AS_NEEDED=	@NO_AS_NEEDED@
  LDLAST=		@LDLAST@
  SGI_ABI=	@SGI_ABI@
-@@ -812,7 +812,7 @@ Objects/setobject.o: $(srcdir)/Objects/s
+@@ -683,7 +683,7 @@ Modules/_testembed: Modules/_testembed.o
+ Modules/_freeze_importlib: Modules/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN)
+ 	$(LINKCC) $(PY_LDFLAGS) -o $@ Modules/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
+ 
+-Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Modules/_freeze_importlib.c
++Python/importlib.h: $(srcdir)/Lib/importlib/_bootstrap.py Modules/_freeze_importlib.c $(LIBRARY_OBJS_OMIT_FROZEN)
+ 	$(MAKE) Modules/_freeze_importlib
+ 	./Modules/_freeze_importlib \
+ 		$(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h
+@@ -828,7 +828,7 @@ Objects/setobject.o: $(srcdir)/Objects/s
  $(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES)
  	$(OPCODETARGETGEN) $(OPCODETARGETS_H)
  
@@ -20,7 +29,7 @@ $NetBSD: patch-au,v 1.1 2014/05/09 02:27:14 wen Exp $
  
  Python/frozen.o: Python/importlib.h
  
-@@ -1050,7 +1050,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
+@@ -1066,7 +1066,8 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
  		if test -n "$(PY3LIBRARY)"; then \
  			$(INSTALL_SHARED) $(PY3LIBRARY) $(DESTDIR)$(LIBDIR)/$(PY3LIBRARY); \
  		fi; \