]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-124043: Disallow mixing `--with-trace-refs` and `--disable-gil` (#124078)
authorPeter Bierma <zintensitydev@gmail.com>
Mon, 16 Sep 2024 20:03:16 +0000 (16:03 -0400)
committerGitHub <noreply@github.com>
Mon, 16 Sep 2024 20:03:16 +0000 (16:03 -0400)
Tracing references is not currently thread-safe in the free-threaded build.

Misc/NEWS.d/next/Build/2024-09-13-17-48-37.gh-issue-124043.Bruxpq.rst [new file with mode: 0644]
configure
configure.ac

diff --git a/Misc/NEWS.d/next/Build/2024-09-13-17-48-37.gh-issue-124043.Bruxpq.rst b/Misc/NEWS.d/next/Build/2024-09-13-17-48-37.gh-issue-124043.Bruxpq.rst
new file mode 100644 (file)
index 0000000..8111b76
--- /dev/null
@@ -0,0 +1,2 @@
+Building using :option:`--with-trace-refs` is (temporarily) disallowed when the
+GIL is disabled.
index ba4fc9301c86002df668e372999c9febc41d77d9..b7055a8f74f5c40f3905986d2ee0347e4920d6f8 100755 (executable)
--- a/configure
+++ b/configure
@@ -8234,6 +8234,10 @@ printf "%s\n" "#define Py_TRACE_REFS 1" >>confdefs.h
 
 fi
 
+if test "$disable_gil" = "yes" -a "$with_trace_refs" = "yes";
+then
+  as_fn_error $? "--disable-gil cannot be used with --with-trace-refs" "$LINENO" 5
+fi
 
 # Check for --enable-pystats
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for --enable-pystats" >&5
index 5fc7e0822f89a8a68c865c3dd8ab8a134d76c1f4..ab6233a13414228a524f11877a89ed8f110d945e 100644 (file)
@@ -1777,6 +1777,10 @@ then
             [Define if you want to enable tracing references for debugging purpose])
 fi
 
+if test "$disable_gil" = "yes" -a "$with_trace_refs" = "yes";
+then
+  AC_MSG_ERROR([--disable-gil cannot be used with --with-trace-refs])
+fi
 
 # Check for --enable-pystats
 AC_MSG_CHECKING([for --enable-pystats])