mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-24 12:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

[3.14] gh-137056: Fix DTrace build support on NetBSD (GH-137057) (GH-137444)

Browse source 
(cherry picked from commit 54a5fdffc8)

Co-authored-by: Furkan Onder <furkanonder@protonmail.com>
This commit is contained in:
Miss Islington (bot) 2025-10-08 14:31:26 +02:00 • committed by GitHub
parent 7ed5419604
commit cbd532f2e8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 41 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile.pre.in
View file

@ -2230,7 +2230,7 @@ Python/frozen.o: $(FROZEN_FILES_OUT)
# an include guard, so we can't use a pipeline to transform its output.
Include/pydtrace_probes.h: $(srcdir)/Include/pydtrace.d
$(MKDIR_P) Include
CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) $(DFLAGS) -o $@ -h -s $<
CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) $(DFLAGS) -o $@ -h -s $(srcdir)/Include/pydtrace.d
: sed in-place edit with POSIX-only tools
sed 's/PYTHON_/PyDTrace_/' $@ > $@.tmp
mv $@.tmp $@
@ -2240,7 +2240,7 @@ Python/gc.o: $(srcdir)/Include/pydtrace.h
Python/import.o: $(srcdir)/Include/pydtrace.h
Python/pydtrace.o: $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS)
CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) $(DFLAGS) -o $@ -G -s $< $(DTRACE_DEPS)
CC="$(CC)" CFLAGS="$(CFLAGS)" $(DTRACE) $(DFLAGS) -o $@ -G -s $(srcdir)/Include/pydtrace.d $(DTRACE_DEPS)
Objects/typeobject.o: Objects/typeslots.inc

22
configure generated vendored
View file

@ -19051,15 +19051,27 @@ printf "%s\n" "#define WITH_DTRACE 1" >>confdefs.h
# linked into the binary. Correspondingly, dtrace(1) is missing the ELF
# generation flag '-G'. We check for presence of this flag, rather than
# hardcoding support by OS, in the interest of robustness.
#
# NetBSD DTrace requires the -x nolibs flag to avoid system library conflicts
# and uses header generation for testing instead of object generation.
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether DTrace probes require linking" >&5
printf %s "checking whether DTrace probes require linking... " >&6; }
if test ${ac_cv_dtrace_link+y}
then :
printf %s "(cached) " >&6
else case e in #(
e) ac_cv_dtrace_link=no
e)
ac_cv_dtrace_link=no
echo 'BEGIN{}' > conftest.d
"$DTRACE" $DFLAGS -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
case $host in
*netbsd*)
DTRACE_TEST_FLAGS="-x nolibs -h"
;;
*)
DTRACE_TEST_FLAGS="-G"
;;
esac
"$DTRACE" $DFLAGS $DTRACE_TEST_FLAGS -s conftest.d -o conftest.o > /dev/null 2>&1 && \
ac_cv_dtrace_link=yes
;;
esac
@ -19069,6 +19081,12 @@ printf "%s\n" "$ac_cv_dtrace_link" >&6; }
if test "$ac_cv_dtrace_link" = "yes"; then
DTRACE_OBJS="Python/pydtrace.o"
fi
# Set NetBSD-specific DTrace flags in DFLAGS
case $host in
*netbsd*)
DFLAGS="$DFLAGS -x nolibs"
;;
esac
fi
PLATFORM_HEADERS=

21
configure.ac
View file

@ -5113,16 +5113,33 @@ then
# linked into the binary. Correspondingly, dtrace(1) is missing the ELF
# generation flag '-G'. We check for presence of this flag, rather than
# hardcoding support by OS, in the interest of robustness.
#
# NetBSD DTrace requires the -x nolibs flag to avoid system library conflicts
# and uses header generation for testing instead of object generation.
AC_CACHE_CHECK([whether DTrace probes require linking],
[ac_cv_dtrace_link], [dnl
[ac_cv_dtrace_link], [
ac_cv_dtrace_link=no
echo 'BEGIN{}' > conftest.d
"$DTRACE" $DFLAGS -G -s conftest.d -o conftest.o > /dev/null 2>&1 && \
case $host in
*netbsd*)
DTRACE_TEST_FLAGS="-x nolibs -h"
;;
*)
DTRACE_TEST_FLAGS="-G"
;;
esac
"$DTRACE" $DFLAGS $DTRACE_TEST_FLAGS -s conftest.d -o conftest.o > /dev/null 2>&1 && \
ac_cv_dtrace_link=yes
])
if test "$ac_cv_dtrace_link" = "yes"; then
DTRACE_OBJS="Python/pydtrace.o"
fi
# Set NetBSD-specific DTrace flags in DFLAGS
case $host in
*netbsd*)
DFLAGS="$DFLAGS -x nolibs"
;;
esac
fi
dnl Platform-specific C and header files.