From: Eric Snow <ericsnowcurrently@gmail.com>
Date: Thu, 8 Sep 2016 01:48:06 +0000 (-0700)
Subject: Issue #15352: Rebuild frozen modules when marshal.c is changed.
X-Git-Tag: v3.6.0b1~300
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=97be87a5c83854e994ab4c10eba5713a61a7bd38;p=thirdparty%2FPython%2Fcpython.git

Issue #15352: Rebuild frozen modules when marshal.c is changed.
---

diff --git a/Makefile.pre.in b/Makefile.pre.in
index e4bee4fec565..4c66b6512569 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -702,11 +702,11 @@ Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile
 Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN)
 	$(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST)
 
-Python/importlib_external.h: @GENERATED_COMMENT@ $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib
+Python/importlib_external.h: @GENERATED_COMMENT@ $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib Python/marshal.c
 	./Programs/_freeze_importlib \
 	    $(srcdir)/Lib/importlib/_bootstrap_external.py Python/importlib_external.h
 
-Python/importlib.h: @GENERATED_COMMENT@ $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib
+Python/importlib.h: @GENERATED_COMMENT@ $(srcdir)/Lib/importlib/_bootstrap.py Programs/_freeze_importlib Python/marshal.c
 	./Programs/_freeze_importlib \
 	    $(srcdir)/Lib/importlib/_bootstrap.py Python/importlib.h
 
diff --git a/Misc/NEWS b/Misc/NEWS
index cacacf6cc68f..7fce84d15fae 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -7859,6 +7859,8 @@ Library
 - Issue #17119: Fixed integer overflows when processing large strings and tuples
   in the tkinter module.
 
+- Issue #15352: Rebuild frozen modules when marshal.c is changed.
+
 - Issue #18747: Re-seed OpenSSL's pseudo-random number generator after fork.
   A pthread_atfork() parent handler is used to seed the PRNG with pid, time
   and some stack data.