bpo-38960: DTrace build fix for FreeBSD. (GH-17451)
DTrace build fix for FreeBSD.
- allowing passing an extra flag as it need to define the arch size.
- casting some probe's arguments.
diff --git a/Misc/NEWS.d/next/Core and Builtins/2019-12-03-16-41-22.bpo-38960.kvoFM0.rst b/Misc/NEWS.d/next/Core and Builtins/2019-12-03-16-41-22.bpo-38960.kvoFM0.rst
new file mode 100644
index 0000000..50d4b6c
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and Builtins/2019-12-03-16-41-22.bpo-38960.kvoFM0.rst
@@ -0,0 +1 @@
+Fix DTrace build issues on FreeBSD. Patch by David Carlier.
diff --git a/Python/ceval.c b/Python/ceval.c
index 2c0a23d..2770dc6 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -5447,7 +5447,7 @@
funcname = PyUnicode_AsUTF8(f->f_code->co_name);
lineno = PyCode_Addr2Line(f->f_code, f->f_lasti);
- PyDTrace_FUNCTION_ENTRY(filename, funcname, lineno);
+ PyDTrace_FUNCTION_ENTRY((char *)filename, (char *)funcname, lineno);
}
static void
@@ -5461,7 +5461,7 @@
funcname = PyUnicode_AsUTF8(f->f_code->co_name);
lineno = PyCode_Addr2Line(f->f_code, f->f_lasti);
- PyDTrace_FUNCTION_RETURN(filename, funcname, lineno);
+ PyDTrace_FUNCTION_RETURN((char *)filename, (char *)funcname, lineno);
}
/* DTrace equivalent of maybe_call_line_trace. */
@@ -5493,7 +5493,7 @@
co_name = PyUnicode_AsUTF8(frame->f_code->co_name);
if (!co_name)
co_name = "?";
- PyDTrace_LINE(co_filename, co_name, line);
+ PyDTrace_LINE((char *)co_filename, (char *)co_name, line);
}
*instr_prev = frame->f_lasti;
}
diff --git a/Python/import.c b/Python/import.c
index 045b6d0..2e5f783 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -1762,14 +1762,14 @@
}
if (PyDTrace_IMPORT_FIND_LOAD_START_ENABLED())
- PyDTrace_IMPORT_FIND_LOAD_START(PyUnicode_AsUTF8(abs_name));
+ PyDTrace_IMPORT_FIND_LOAD_START((char *)PyUnicode_AsUTF8(abs_name));
mod = _PyObject_CallMethodIdObjArgs(interp->importlib,
&PyId__find_and_load, abs_name,
interp->import_func, NULL);
if (PyDTrace_IMPORT_FIND_LOAD_DONE_ENABLED())
- PyDTrace_IMPORT_FIND_LOAD_DONE(PyUnicode_AsUTF8(abs_name),
+ PyDTrace_IMPORT_FIND_LOAD_DONE((char *)PyUnicode_AsUTF8(abs_name),
mod != NULL);
if (import_time) {
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 9f866a2..17e7960 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -204,7 +204,7 @@
/* Dtrace USDT point */
if (dtrace) {
- PyDTrace_AUDIT(event, (void *)eventArgs);
+ PyDTrace_AUDIT((char *)event, (void *)eventArgs);
}
/* Call interpreter hooks */
diff --git a/configure b/configure
index 85120e4..595c129 100755
--- a/configure
+++ b/configure
@@ -11386,7 +11386,6 @@
DTRACE=
-DFLAGS=
DTRACE_HEADERS=
DTRACE_OBJS=
@@ -11452,7 +11451,7 @@
else
ac_cv_dtrace_link=no
echo 'BEGIN{}' > conftest.d
- "$DTRACE" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
+ "$DTRACE" "$DFLAGS" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
ac_cv_dtrace_link=yes
fi
diff --git a/configure.ac b/configure.ac
index ab8e1b7..fee605e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3500,7 +3500,6 @@
AC_SUBST(DTRACE_HEADERS)
AC_SUBST(DTRACE_OBJS)
DTRACE=
-DFLAGS=
DTRACE_HEADERS=
DTRACE_OBJS=
@@ -3521,7 +3520,7 @@
[ac_cv_dtrace_link], [dnl
ac_cv_dtrace_link=no
echo 'BEGIN{}' > conftest.d
- "$DTRACE" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
+ "$DTRACE" "$DFLAGS" -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
ac_cv_dtrace_link=yes
])
if test "$ac_cv_dtrace_link" = "yes"; then