Skip to content

Commit

Permalink
pythongh-115119: Default to --with-system-libmpdec=yes
Browse files Browse the repository at this point in the history
Mark _decimal as missing if libmpdecimal is not found.
  • Loading branch information
erlend-aasland committed May 3, 2024
1 parent f201628 commit 268d270
Show file tree
Hide file tree
Showing 3 changed files with 104 additions and 9 deletions.
7 changes: 5 additions & 2 deletions Doc/using/configure.rst
Original file line number Diff line number Diff line change
Expand Up @@ -804,11 +804,14 @@ Libraries options

.. option:: --with-system-libmpdec

Build the ``_decimal`` extension module using an installed ``mpdec``
library, see the :mod:`decimal` module (default is no).
Build the ``_decimal`` extension module using an installed ``mpdecimal``
library, see the :mod:`decimal` module (default is yes).

.. versionadded:: 3.3

.. versionchanged:: 3.13
Default to using the installed ``mpdecimal`` library.

.. seealso:: :option:`LIBMPDEC_CFLAGS` and :option:`LIBMPDEC_LIBS`.

.. option:: --with-readline=readline|editline
Expand Down
90 changes: 86 additions & 4 deletions configure

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 13 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -3974,10 +3974,10 @@ AC_ARG_WITH(
[system_libmpdec],
[AS_HELP_STRING(
[--with-system-libmpdec],
[build _decimal module using an installed libmpdec library, see Doc/library/decimal.rst (default is no)]
[build _decimal module using an installed mpdecimal library, see Doc/library/decimal.rst (default is yes)]
)],
[],
[with_system_libmpdec="no"])
[with_system_libmpdec="yes"])
AC_MSG_RESULT([$with_system_libmpdec])

AS_VAR_IF(
Expand All @@ -3991,6 +3991,14 @@ AS_VAR_IF(
LIBMPDEC_LIBS="-lm \$(LIBMPDEC_A)"
LIBMPDEC_INTERNAL="\$(LIBMPDEC_HEADERS) \$(LIBMPDEC_A)"])

AS_VAR_IF([with_system_libmpdec], [yes],
[WITH_SAVE_ENV([
CPPFLAGS="$LIBMPDEC_CFLAGS $CPPFLAGS"
LDFLAGS="$LIBMPDEC_LIBS $LDFLAGS"
AC_SEARCH_LIBS([mpd_version], [mpdec],
[have_mpdec=yes], [have_mpdec=no])])],
[have_mpdec=yes])

# Disable forced inlining in debug builds, see GH-94847
AS_VAR_IF(
[with_pydebug], [yes],
Expand Down Expand Up @@ -7665,7 +7673,9 @@ PY_STDLIB_MOD([_curses_panel],
[], [test "$have_panel" != "no"],
[$PANEL_CFLAGS $CURSES_CFLAGS], [$PANEL_LIBS $CURSES_LIBS]
)
PY_STDLIB_MOD([_decimal], [], [], [$LIBMPDEC_CFLAGS], [$LIBMPDEC_LIBS])
PY_STDLIB_MOD([_decimal],
[], [test "$have_mpdec" = "yes"],
[$LIBMPDEC_CFLAGS], [$LIBMPDEC_LIBS])
PY_STDLIB_MOD([_dbm],
[test -n "$with_dbmliborder"], [test "$have_dbm" != "no"],
[$DBM_CFLAGS], [$DBM_LIBS])
Expand Down

0 comments on commit 268d270

Please sign in to comment.