https://github.com/python/cpython/commit/d864b0094f9875c5613cbb0b7f7f3ca8f1c6b606
commit: d864b0094f9875c5613cbb0b7f7f3ca8f1c6b606
branch: main
author: Erlend E. Aasland <[email protected]>
committer: erlend-aasland <[email protected]>
date: 2024-03-07T23:42:43Z
summary:
gh-116303: Explicitly check for the _testsinglephase module in configure.ac
(#116479)
files:
M Modules/Setup.stdlib.in
M configure
M configure.ac
diff --git a/Modules/Setup.stdlib.in b/Modules/Setup.stdlib.in
index d2acbc2a568726..e8eaafd8b99b98 100644
--- a/Modules/Setup.stdlib.in
+++ b/Modules/Setup.stdlib.in
@@ -171,7 +171,7 @@
*shared*
@MODULE__TESTIMPORTMULTIPLE_TRUE@_testimportmultiple _testimportmultiple.c
@MODULE__TESTMULTIPHASE_TRUE@_testmultiphase _testmultiphase.c
-@MODULE__TESTMULTIPHASE_TRUE@_testsinglephase _testsinglephase.c
+@MODULE__TESTSINGLEPHASE_TRUE@_testsinglephase _testsinglephase.c
@MODULE__TESTEXTERNALINSPECTION_TRUE@_testexternalinspection
_testexternalinspection.c
@MODULE__CTYPES_TEST_TRUE@_ctypes_test _ctypes/_ctypes_test.c
diff --git a/configure b/configure
index 44bd54023551a9..5e8c9af7befde0 100755
--- a/configure
+++ b/configure
@@ -663,6 +663,8 @@ MODULE_XXSUBTYPE_FALSE
MODULE_XXSUBTYPE_TRUE
MODULE__TESTEXTERNALINSPECTION_FALSE
MODULE__TESTEXTERNALINSPECTION_TRUE
+MODULE__TESTSINGLEPHASE_FALSE
+MODULE__TESTSINGLEPHASE_TRUE
MODULE__TESTMULTIPHASE_FALSE
MODULE__TESTMULTIPHASE_TRUE
MODULE__TESTIMPORTMULTIPLE_FALSE
@@ -30964,6 +30966,44 @@ fi
printf "%s\n" "$py_cv_module__testmultiphase" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdlib extension
module _testsinglephase" >&5
+printf %s "checking for stdlib extension module _testsinglephase... " >&6; }
+ if test "$py_cv_module__testsinglephase" != "n/a"
+then :
+
+ if test "$TEST_MODULES" = yes
+then :
+ if test "$ac_cv_func_dlopen" = yes
+then :
+ py_cv_module__testsinglephase=yes
+else $as_nop
+ py_cv_module__testsinglephase=missing
+fi
+else $as_nop
+ py_cv_module__testsinglephase=disabled
+fi
+
+fi
+ as_fn_append MODULE_BLOCK
"MODULE__TESTSINGLEPHASE_STATE=$py_cv_module__testsinglephase$as_nl"
+ if test "x$py_cv_module__testsinglephase" = xyes
+then :
+
+
+
+
+fi
+ if test "$py_cv_module__testsinglephase" = yes; then
+ MODULE__TESTSINGLEPHASE_TRUE=
+ MODULE__TESTSINGLEPHASE_FALSE='#'
+else
+ MODULE__TESTSINGLEPHASE_TRUE='#'
+ MODULE__TESTSINGLEPHASE_FALSE=
+fi
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result:
$py_cv_module__testsinglephase" >&5
+printf "%s\n" "$py_cv_module__testsinglephase" >&6; }
+
+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for stdlib extension
module _testexternalinspection" >&5
printf %s "checking for stdlib extension module _testexternalinspection... "
>&6; }
if test "$py_cv_module__testexternalinspection" != "n/a"
@@ -31618,6 +31658,10 @@ if test -z "${MODULE__TESTMULTIPHASE_TRUE}" && test -z
"${MODULE__TESTMULTIPHASE
as_fn_error $? "conditional \"MODULE__TESTMULTIPHASE\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${MODULE__TESTSINGLEPHASE_TRUE}" && test -z
"${MODULE__TESTSINGLEPHASE_FALSE}"; then
+ as_fn_error $? "conditional \"MODULE__TESTSINGLEPHASE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${MODULE__TESTEXTERNALINSPECTION_TRUE}" && test -z
"${MODULE__TESTEXTERNALINSPECTION_FALSE}"; then
as_fn_error $? "conditional \"MODULE__TESTEXTERNALINSPECTION\" was never
defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
diff --git a/configure.ac b/configure.ac
index bf5680e8ac2edd..e615259dcb1fca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7628,6 +7628,7 @@ PY_STDLIB_MOD([_testinternalcapi], [test "$TEST_MODULES"
= yes])
PY_STDLIB_MOD([_testbuffer], [test "$TEST_MODULES" = yes])
PY_STDLIB_MOD([_testimportmultiple], [test "$TEST_MODULES" = yes], [test
"$ac_cv_func_dlopen" = yes])
PY_STDLIB_MOD([_testmultiphase], [test "$TEST_MODULES" = yes], [test
"$ac_cv_func_dlopen" = yes])
+PY_STDLIB_MOD([_testsinglephase], [test "$TEST_MODULES" = yes], [test
"$ac_cv_func_dlopen" = yes])
PY_STDLIB_MOD([_testexternalinspection], [test "$TEST_MODULES" = yes])
PY_STDLIB_MOD([xxsubtype], [test "$TEST_MODULES" = yes])
PY_STDLIB_MOD([_xxtestfuzz], [test "$TEST_MODULES" = yes])
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
