traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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


https://bugs.python.org/issue37215
This commit is contained in:
Christian Heimes 2019-06-10 17:19:48 +02:00 committed by Miss Islington (bot)
parent e042a4553e
commit 8a8b59c979
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.pre.in
View File

@ -438,7 +438,7 @@ LIBRARY_OBJS= \
# On some systems, object files that reference DTrace probes need to be modified # On some systems, object files that reference DTrace probes need to be modified
# in-place by dtrace(1). # in-place by dtrace(1).
DTRACE_DEPS = \ DTRACE_DEPS = \
Python/ceval.o Python/import.o Modules/gcmodule.o Python/ceval.o Python/import.o Python/sysmodule.o Modules/gcmodule.o
######################################################################### #########################################################################
# Rules # Rules
@ -780,7 +780,7 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile
-DSHLIB_EXT='"$(EXT_SUFFIX)"' \ -DSHLIB_EXT='"$(EXT_SUFFIX)"' \
-o $@ $(srcdir)/Python/dynload_hpux.c -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) \ $(CC) -c $(PY_CORE_CFLAGS) \
-DABIFLAGS='"$(ABIFLAGS)"' \ -DABIFLAGS='"$(ABIFLAGS)"' \
$(MULTIARCH_CPPFLAGS) \ $(MULTIARCH_CPPFLAGS) \
@ -938,9 +938,9 @@ Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d
sed 's/PYTHON_/PyDTrace_/' $@ > $@.tmp sed 's/PYTHON_/PyDTrace_/' $@ > $@.tmp
mv $@.tmp $@ mv $@.tmp $@
Python/ceval.o: Include/pydtrace.h Python/ceval.o: $(srcdir)/Include/pydtrace.h
Python/import.o: Include/pydtrace.h Python/import.o: $(srcdir)/Include/pydtrace.h
Modules/gcmodule.o: Include/pydtrace.h Modules/gcmodule.o: $(srcdir)/Include/pydtrace.h
Python/pydtrace.o: $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS) Python/pydtrace.o: $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS)
$(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS) $(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS)

1
Misc/NEWS.d/next/C API/2019-06-10-15-32-34.bpo-37215.yzoNyU.rst Normal file
View File

@ -0,0 +1 @@
Fix dtrace issue introduce by bpo-36842