diff options
| author | tnn <tnn> | 2015-03-16 13:53:05 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2015-03-16 13:53:05 +0000 |
| commit | c6f94ec9fec40c06cb0aa9e49dff723e85ec70a5 (patch) | |
| tree | 858780bd84911f5dfb06593d52ab97996e8830f5 /lang/python34 | |
| parent | 6bb15e4bb362d85d8624445858537f009e861581 (diff) | |
| download | pkgsrc-c6f94ec9fec40c06cb0aa9e49dff723e85ec70a5.tar.gz | |
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
Diffstat (limited to 'lang/python34')
| -rw-r--r-- | lang/python34/distinfo | 4 | ||||
| -rw-r--r-- | lang/python34/patches/patch-au | 19 |
2 files changed, 16 insertions, 7 deletions
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; \ |