gh-115119: Remove implicit fallback to the bundled libmpdec (#134078)
Co-authored-by: Victor Stinner <vstinner@python.org> Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
93809a918f
commit
17cf0a343b
44
configure.ac
44
configure.ac
@@ -4169,22 +4169,22 @@ fi
|
||||
|
||||
# Check for use of the system libmpdec library
|
||||
AC_MSG_CHECKING([for --with-system-libmpdec])
|
||||
AC_ARG_WITH(
|
||||
[system_libmpdec],
|
||||
[AS_HELP_STRING(
|
||||
[--with-system-libmpdec],
|
||||
[build _decimal module using an installed mpdecimal library, see Doc/library/decimal.rst (default is yes)]
|
||||
)],
|
||||
[],
|
||||
[with_system_libmpdec="yes"])
|
||||
AC_MSG_RESULT([$with_system_libmpdec])
|
||||
|
||||
AC_DEFUN([USE_BUNDLED_LIBMPDEC],
|
||||
[LIBMPDEC_CFLAGS="-I\$(srcdir)/Modules/_decimal/libmpdec"
|
||||
LIBMPDEC_LIBS="-lm \$(LIBMPDEC_A)"
|
||||
LIBMPDEC_INTERNAL="\$(LIBMPDEC_HEADERS) \$(LIBMPDEC_A)"
|
||||
have_mpdec=yes
|
||||
with_system_libmpdec=no])
|
||||
AC_ARG_WITH(
|
||||
[system_libmpdec],
|
||||
[AS_HELP_STRING(
|
||||
[--with-system-libmpdec],
|
||||
[build _decimal module using an installed mpdecimal library, see Doc/library/decimal.rst (default is yes)]
|
||||
)],
|
||||
[AS_IF([test "x$with_system_libmpdec" = xno],
|
||||
[USE_BUNDLED_LIBMPDEC()])],
|
||||
[with_system_libmpdec="yes"])
|
||||
AC_MSG_RESULT([$with_system_libmpdec])
|
||||
|
||||
AS_VAR_IF(
|
||||
[with_system_libmpdec], [yes],
|
||||
@@ -4192,8 +4192,7 @@ AS_VAR_IF(
|
||||
[LIBMPDEC], [libmpdec >= 2.5.0], [],
|
||||
[LIBMPDEC_CFLAGS=${LIBMPDEC_CFLAGS-""}
|
||||
LIBMPDEC_LIBS=${LIBMPDEC_LIBS-"-lmpdec -lm"}
|
||||
LIBMPDEC_INTERNAL=])],
|
||||
[USE_BUNDLED_LIBMPDEC()])
|
||||
LIBMPDEC_INTERNAL=])])
|
||||
|
||||
AS_VAR_IF([with_system_libmpdec], [yes],
|
||||
[WITH_SAVE_ENV([
|
||||
@@ -4209,16 +4208,7 @@ AS_VAR_IF([with_system_libmpdec], [yes],
|
||||
], [const char *x = mpd_version();])],
|
||||
[have_mpdec=yes],
|
||||
[have_mpdec=no])
|
||||
])],
|
||||
[AC_MSG_WARN([m4_normalize([
|
||||
the bundled copy of libmpdecimal is scheduled for removal in Python 3.15;
|
||||
consider using a system installed mpdecimal library.])])])
|
||||
|
||||
AS_IF([test "$with_system_libmpdec" = "yes" && test "$have_mpdec" = "no"],
|
||||
[AC_MSG_WARN([m4_normalize([
|
||||
no system libmpdecimal found; falling back to bundled libmpdecimal
|
||||
(deprecated and scheduled for removal in Python 3.15)])])
|
||||
USE_BUNDLED_LIBMPDEC()])
|
||||
])])
|
||||
|
||||
# Disable forced inlining in debug builds, see GH-94847
|
||||
AS_VAR_IF(
|
||||
@@ -8136,6 +8126,16 @@ PY_STDLIB_MOD([_curses_panel],
|
||||
PY_STDLIB_MOD([_decimal],
|
||||
[], [test "$have_mpdec" = "yes"],
|
||||
[$LIBMPDEC_CFLAGS], [$LIBMPDEC_LIBS])
|
||||
|
||||
AS_VAR_IF([with_system_libmpdec], [no],
|
||||
[AC_MSG_WARN([m4_normalize([
|
||||
the bundled copy of libmpdecimal is scheduled for removal in Python 3.16;
|
||||
consider using a system installed mpdecimal library.])])])
|
||||
AS_IF([test "$with_system_libmpdec" = "yes" && test "$have_mpdec" = "no"],
|
||||
[AC_MSG_WARN([m4_normalize([
|
||||
no system libmpdecimal found; falling back to pure-Python version
|
||||
for the decimal module])])])
|
||||
|
||||
PY_STDLIB_MOD([_dbm],
|
||||
[test -n "$with_dbmliborder"], [test "$have_dbm" != "no"],
|
||||
[$DBM_CFLAGS], [$DBM_LIBS])
|
||||
|
||||
Reference in New Issue
Block a user