From: Christian Heimes <christian@python.org>
Date: Mon, 10 Jun 2019 15:19:48 +0000 (+0200)
Subject: bpo-37215: Fix dtrace issue introduce by bpo-36842 (GH-13940)
X-Git-Tag: v3.9.0a1~1332
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a8b59c9794674b50b2242698c29038034f4864c;p=thirdparty%2FPython%2Fcpython.git

bpo-37215: Fix dtrace issue introduce by bpo-36842 (GH-13940)



Signed-off-by: Christian Heimes <christian@python.org>


https://bugs.python.org/issue37215
---

diff --git a/Makefile.pre.in b/Makefile.pre.in
index a0bc9c1f1cc8..2b4e2d776ea9 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -438,7 +438,7 @@ LIBRARY_OBJS=	\
 # On some systems, object files that reference DTrace probes need to be modified
 # in-place by dtrace(1).
 DTRACE_DEPS = \
-	Python/ceval.o Python/import.o Modules/gcmodule.o
+	Python/ceval.o Python/import.o Python/sysmodule.o Modules/gcmodule.o
 
 #########################################################################
 # Rules
@@ -780,7 +780,7 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile
 		-DSHLIB_EXT='"$(EXT_SUFFIX)"' \
 		-o $@ $(srcdir)/Python/dynload_hpux.c
 
-Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile
+Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(srcdir)/Include/pydtrace.h
 	$(CC) -c $(PY_CORE_CFLAGS) \
 		-DABIFLAGS='"$(ABIFLAGS)"' \
 		$(MULTIARCH_CPPFLAGS) \
@@ -938,9 +938,9 @@ Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d
 	sed 's/PYTHON_/PyDTrace_/' $@ > $@.tmp
 	mv $@.tmp $@
 
-Python/ceval.o: Include/pydtrace.h
-Python/import.o: Include/pydtrace.h
-Modules/gcmodule.o: Include/pydtrace.h
+Python/ceval.o: $(srcdir)/Include/pydtrace.h
+Python/import.o: $(srcdir)/Include/pydtrace.h
+Modules/gcmodule.o: $(srcdir)/Include/pydtrace.h
 
 Python/pydtrace.o: $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS)
 	$(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS)
diff --git a/Misc/NEWS.d/next/C API/2019-06-10-15-32-34.bpo-37215.yzoNyU.rst b/Misc/NEWS.d/next/C API/2019-06-10-15-32-34.bpo-37215.yzoNyU.rst
new file mode 100644
index 000000000000..58038b21729b
--- /dev/null
+++ b/Misc/NEWS.d/next/C API/2019-06-10-15-32-34.bpo-37215.yzoNyU.rst	
@@ -0,0 +1 @@
+Fix dtrace issue introduce by bpo-36842