Skip to content

Commit 2422e7d

Browse files
committed
Revert "address review: add --with-libmpdec option"
This reverts commit 4c98b8d.
1 parent 3f059de commit 2422e7d

File tree

4 files changed

+14
-52
lines changed

4 files changed

+14
-52
lines changed

Doc/using/configure.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -851,13 +851,6 @@ Libraries options
851851

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

854-
.. option:: --with-libmpdec
855-
856-
Whether to build the ``_decimal`` extension module (default is yes).
857-
See also the :option:`--with-system-libmpdec` option.
858-
859-
.. versionadded:: next
860-
861854
.. option:: --with-readline=readline|editline
862855

863856
Designate a backend library for the :mod:`readline` module.

Doc/whatsnew/3.15.rst

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,8 +296,6 @@ Build changes
296296
* Removed implicit fallback to the bundled copy of the ``libmpdec`` library.
297297
Now this should be explicitly enabled with :option:`--with-system-libmpdec`
298298
set to ``no`` or with :option:`!--without-system-libmpdec`.
299-
The :option:`--without-libmpdec <--with-libmpdec>` should be used to permit building
300-
CPython without the ``_decimal`` module.
301299
(Contributed by Sergey B Kirpichev in :gh:`115119`.)
302300

303301

configure

Lines changed: 7 additions & 25 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

configure.ac

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4171,16 +4171,6 @@ if test "$ac_cv_ffi_complex_double_supported" = "yes"; then
41714171
[Defined if _Complex C type can be used with libffi.])
41724172
fi
41734173

4174-
# Check for use of the libmpdec library
4175-
AC_MSG_CHECKING([for --with-libmpdec])
4176-
AC_ARG_WITH(
4177-
[libmpdec],
4178-
[AS_HELP_STRING(
4179-
[--with-libmpdec],
4180-
[build _decimal module (default is yes)]
4181-
)])
4182-
AC_MSG_RESULT([$with_libmpdec])
4183-
41844174
# Check for use of the system libmpdec library
41854175
AC_MSG_CHECKING([for --with-system-libmpdec])
41864176
AC_DEFUN([USE_BUNDLED_LIBMPDEC],
@@ -4195,7 +4185,7 @@ AC_ARG_WITH(
41954185
[--with-system-libmpdec],
41964186
[build _decimal module using an installed mpdecimal library, see Doc/library/decimal.rst (default is yes)]
41974187
)],
4198-
[AS_IF([test "x$with_system_libmpdec" = xno && test "x$with_libmpdec" = xyes],
4188+
[AS_IF([test "x$with_system_libmpdec" = xno],
41994189
[USE_BUNDLED_LIBMPDEC()])],
42004190
[with_system_libmpdec="yes"])
42014191
AC_MSG_RESULT([$with_system_libmpdec])
@@ -4223,16 +4213,15 @@ AS_VAR_IF([with_system_libmpdec], [yes],
42234213
[have_mpdec=yes],
42244214
[have_mpdec=no])
42254215
])])
4226-
AS_IF([test "$with_system_libmpdec" = "no" && test "$with_libmpdec" = "yes"],
4216+
AS_VAR_IF([with_system_libmpdec], [no],
42274217
[AC_MSG_WARN([m4_normalize([
4228-
the bundled copy of libmpdec is scheduled for removal in Python 3.16;
4218+
the bundled copy of libmpdecimal is scheduled for removal in Python 3.16;
42294219
consider using a system installed mpdecimal library.])])])
42304220

4231-
AS_IF([test "$with_libmpdec" = "yes" && test "$have_mpdec" = "no"],
4232-
[AC_MSG_ERROR([m4_normalize([
4233-
no system libmpdec found; use --without-libmpdec to build Python with only pure-Python version for the decimal module])])])
4234-
AS_VAR_IF([with_libmpdec], [no],
4235-
[AS_VAR_SET([py_cv_module_]_decimal, [n/a])])
4221+
AS_IF([test "$with_system_libmpdec" = "yes" && test "$have_mpdec" = "no"],
4222+
[AC_MSG_WARN([m4_normalize([
4223+
no system libmpdecimal found; falling back to pure-Python version
4224+
for the decimal module])])])
42364225

42374226
# Disable forced inlining in debug builds, see GH-94847
42384227
AS_VAR_IF(

0 commit comments

Comments
 (0)