54 lines
2.6 KiB
Diff
54 lines
2.6 KiB
Diff
From 4208da1c8215d9db6830c64e6f0ceff7d85bb09a Mon Sep 17 00:00:00 2001
|
|
From: Christoph Reiter <reiter.christoph@gmail.com>
|
|
Date: Fri, 23 Jun 2023 23:42:39 +0200
|
|
Subject: [PATCH 091/N] configure.ac: fix building some test modules
|
|
|
|
they are guarded by dlopen being present, but if module loading is enabled
|
|
is more correct.
|
|
---
|
|
configure.ac | 13 ++++++++-----
|
|
1 file changed, 8 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index f4a8fcb..9cb1a45 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -5150,8 +5150,11 @@ fi
|
|
AC_MSG_RESULT([$DYNLOADFILE])
|
|
if test "$DYNLOADFILE" != "dynload_stub.o"
|
|
then
|
|
+ have_dynamic_loading=yes
|
|
AC_DEFINE([HAVE_DYNAMIC_LOADING], [1],
|
|
[Defined when any dynamic module loading is enabled.])
|
|
+else
|
|
+ have_dynamic_loading=no
|
|
fi
|
|
|
|
# MACHDEP_OBJS can be set to platform-specific object files needed by Python
|
|
@@ -8025,20 +8028,20 @@ PY_STDLIB_MOD([_testcapi], [test "$TEST_MODULES" = yes])
|
|
PY_STDLIB_MOD([_testclinic], [test "$TEST_MODULES" = yes])
|
|
PY_STDLIB_MOD([_testinternalcapi], [test "$TEST_MODULES" = yes], [], [-DPY3_DLLNAME="\"$DLLLIBRARY\""], [])
|
|
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([_testimportmultiple], [test "$TEST_MODULES" = yes], [test "$have_dynamic_loading" = yes])
|
|
+PY_STDLIB_MOD([_testmultiphase], [test "$TEST_MODULES" = yes], [test "$have_dynamic_loading" = yes])
|
|
PY_STDLIB_MOD([xxsubtype], [test "$TEST_MODULES" = yes])
|
|
PY_STDLIB_MOD([_xxtestfuzz], [test "$TEST_MODULES" = yes])
|
|
PY_STDLIB_MOD([_testconsole], [test "$TEST_MODULES" = yes -a "$MACHDEP" = "win32"])
|
|
PY_STDLIB_MOD([_ctypes_test],
|
|
- [test "$TEST_MODULES" = yes], [test "$have_libffi" = yes -a "$ac_cv_func_dlopen" = yes],
|
|
+ [test "$TEST_MODULES" = yes], [test "$have_libffi" = yes -a "$have_dynamic_loading" = yes],
|
|
[], [$LIBM])
|
|
|
|
dnl Limited API template modules.
|
|
dnl The limited C API is not compatible with the Py_TRACE_REFS macro.
|
|
dnl Emscripten does not support shared libraries yet.
|
|
-PY_STDLIB_MOD([xxlimited], [test "$with_trace_refs" = "no"], [test "$ac_cv_func_dlopen" = yes])
|
|
-PY_STDLIB_MOD([xxlimited_35], [test "$with_trace_refs" = "no"], [test "$ac_cv_func_dlopen" = yes])
|
|
+PY_STDLIB_MOD([xxlimited], [test "$with_trace_refs" = "no"], [test "$have_dynamic_loading" = yes])
|
|
+PY_STDLIB_MOD([xxlimited_35], [test "$with_trace_refs" = "no"], [test "$have_dynamic_loading" = yes])
|
|
|
|
# substitute multiline block, must come after last PY_STDLIB_MOD()
|
|
AC_SUBST([MODULE_BLOCK])
|