Skip to content

Commit 9d6c9b5

Browse files
skirpichevskirpichev
committed
+1
1 parent 43c8721 commit 9d6c9b5

File tree

15 files changed

+28
-1368
lines changed

15 files changed

+28
-1368
lines changed

‎Doc/deprecations/c-api-pending-removal-in-3.15.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
Pending removal in Python 3.15
22
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
33

4-
* The bundled copy of ``libmpdecimal``.
54
* The :c:func:`!PyImport_ImportModuleNoBlock`:
65
Use :c:func:`PyImport_ImportModule` instead.
76
* :c:func:`PyWeakref_GetObject` and :c:func:`PyWeakref_GET_OBJECT`:

‎Doc/license.rst

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -975,39 +975,6 @@ on the cfuhash project::
975975
OF THE POSSIBILITY OF SUCH DAMAGE.
976976

977977

978-
libmpdec
979-
--------
980-
981-
The :mod:`!_decimal` C extension underlying the :mod:`decimal` module
982-
is built using an included copy of the libmpdec
983-
library unless the build is configured ``--with-system-libmpdec``::
984-
985-
Copyright (c) 2008-2020 Stefan Krah. All rights reserved.
986-
987-
Redistribution and use in source and binary forms, with or without
988-
modification, are permitted provided that the following conditions
989-
are met:
990-
991-
1. Redistributions of source code must retain the above copyright
992-
notice, this list of conditions and the following disclaimer.
993-
994-
2. Redistributions in binary form must reproduce the above copyright
995-
notice, this list of conditions and the following disclaimer in the
996-
documentation and/or other materials provided with the distribution.
997-
998-
THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND
999-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
1000-
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
1001-
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
1002-
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
1003-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
1004-
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
1005-
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
1006-
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
1007-
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
1008-
SUCH DAMAGE.
1009-
1010-
1011978
W3C C14N test suite
1012979
-------------------
1013980

‎Doc/using/configure.rst

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -416,11 +416,6 @@ Options for third-party dependencies
416416
C compiler and linker flags for ``libmpdec``, used by :mod:`decimal` module,
417417
overriding ``pkg-config``.
418418

419-
.. note::
420-
421-
These environment variables have no effect unless
422-
:option:`--with-system-libmpdec` is specified.
423-
424419
.. option:: LIBLZMA_CFLAGS
425420
.. option:: LIBLZMA_LIBS
426421

@@ -835,22 +830,6 @@ Libraries options
835830
Build the :mod:`!pyexpat` module using an installed ``expat`` library
836831
(default is no).
837832

838-
.. option:: --with-system-libmpdec
839-
840-
Build the ``_decimal`` extension module using an installed ``mpdecimal``
841-
library, see the :mod:`decimal` module (default is yes).
842-
843-
.. versionadded:: 3.3
844-
845-
.. versionchanged:: 3.13
846-
Default to using the installed ``mpdecimal`` library.
847-
848-
.. deprecated-removed:: 3.13 3.15
849-
A copy of the ``mpdecimal`` library sources will no longer be distributed
850-
with Python 3.15.
851-
852-
.. seealso:: :option:`LIBMPDEC_CFLAGS` and :option:`LIBMPDEC_LIBS`.
853-
854833
.. option:: --with-readline=readline|editline
855834

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

‎Doc/whatsnew/3.13.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2575,7 +2575,7 @@ Build Changes
25752575

25762576
.. _mimalloc library: https://github.com/microsoft/mimalloc/
25772577

2578-
* The :file:`configure` option :option:`--with-system-libmpdec`
2578+
* The :file:`configure` option ``--with-system-libmpdec``
25792579
now defaults to ``yes``.
25802580
The bundled copy of ``libmpdecimal`` will be removed in Python 3.15.
25812581

‎Mac/BuildScript/build-installer.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1158,7 +1158,6 @@ def buildPython():
11581158
print(" NOTE: --with-mimalloc=no pending resolution of weak linking issues")
11591159
runCommand("%s -C --enable-framework --enable-universalsdk=/ "
11601160
"--with-mimalloc=no "
1161-
"--with-system-libmpdec "
11621161
"--with-universal-archs=%s "
11631162
"%s "
11641163
"%s "

‎Makefile.pre.in

Lines changed: 0 additions & 95 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@ RUNSHARED= @RUNSHARED@
225225
ENSUREPIP= @ENSUREPIP@
226226

227227
# Internal static libraries
228-
LIBMPDEC_A= Modules/_decimal/libmpdec/libmpdec.a
229228
LIBEXPAT_A= Modules/expat/libexpat.a
230229

231230
# HACL* build configuration
@@ -589,45 +588,6 @@ LINK_PYTHON_OBJS=@LINK_PYTHON_OBJS@
589588
DTRACE_DEPS = \
590589
Python/ceval.o Python/gc.o Python/import.o Python/sysmodule.o
591590

592-
##########################################################################
593-
# decimal's libmpdec
594-
595-
LIBMPDEC_OBJS= \
596-
Modules/_decimal/libmpdec/basearith.o \
597-
Modules/_decimal/libmpdec/constants.o \
598-
Modules/_decimal/libmpdec/context.o \
599-
Modules/_decimal/libmpdec/convolute.o \
600-
Modules/_decimal/libmpdec/crt.o \
601-
Modules/_decimal/libmpdec/difradix2.o \
602-
Modules/_decimal/libmpdec/fnt.o \
603-
Modules/_decimal/libmpdec/fourstep.o \
604-
Modules/_decimal/libmpdec/io.o \
605-
Modules/_decimal/libmpdec/mpalloc.o \
606-
Modules/_decimal/libmpdec/mpdecimal.o \
607-
Modules/_decimal/libmpdec/numbertheory.o \
608-
Modules/_decimal/libmpdec/sixstep.o \
609-
Modules/_decimal/libmpdec/transpose.o
610-
# _decimal does not use signaling API
611-
# Modules/_decimal/libmpdec/mpsignal.o
612-
613-
LIBMPDEC_HEADERS= \
614-
$(srcdir)/Modules/_decimal/libmpdec/basearith.h \
615-
$(srcdir)/Modules/_decimal/libmpdec/bits.h \
616-
$(srcdir)/Modules/_decimal/libmpdec/constants.h \
617-
$(srcdir)/Modules/_decimal/libmpdec/convolute.h \
618-
$(srcdir)/Modules/_decimal/libmpdec/crt.h \
619-
$(srcdir)/Modules/_decimal/libmpdec/difradix2.h \
620-
$(srcdir)/Modules/_decimal/libmpdec/fnt.h \
621-
$(srcdir)/Modules/_decimal/libmpdec/fourstep.h \
622-
$(srcdir)/Modules/_decimal/libmpdec/io.h \
623-
$(srcdir)/Modules/_decimal/libmpdec/mpalloc.h \
624-
$(srcdir)/Modules/_decimal/libmpdec/mpdecimal.h \
625-
$(srcdir)/Modules/_decimal/libmpdec/numbertheory.h \
626-
$(srcdir)/Modules/_decimal/libmpdec/sixstep.h \
627-
$(srcdir)/Modules/_decimal/libmpdec/transpose.h \
628-
$(srcdir)/Modules/_decimal/libmpdec/typearith.h \
629-
$(srcdir)/Modules/_decimal/libmpdec/umodarith.h
630-
631591
##########################################################################
632592
# pyexpat's expat library
633593

@@ -945,7 +905,6 @@ coverage-lcov:
945905
@lcov $(COVERAGE_LCOV_OPTIONS) --remove $(COVERAGE_INFO) \
946906
'*/Modules/_hacl/*' \
947907
'*/Modules/_ctypes/libffi*/*' \
948-
'*/Modules/_decimal/libmpdec/*' \
949908
'*/Modules/expat/*' \
950909
'*/Modules/xx*.c' \
951910
'*/Python/pyfpe.c' \
@@ -1409,60 +1368,6 @@ PYTHON_HEADERS= \
14091368
\
14101369
$(srcdir)/Python/stdlib_module_names.h
14111370

1412-
##########################################################################
1413-
# Build static libmpdec.a
1414-
LIBMPDEC_CFLAGS=@LIBMPDEC_CFLAGS@ $(PY_STDMODULE_CFLAGS) $(CCSHARED)
1415-
1416-
# "%.o: %c" is not portable
1417-
Modules/_decimal/libmpdec/basearith.o: $(srcdir)/Modules/_decimal/libmpdec/basearith.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1418-
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/basearith.c
1419-
1420-
Modules/_decimal/libmpdec/constants.o: $(srcdir)/Modules/_decimal/libmpdec/constants.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1421-
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/constants.c
1422-
1423-
Modules/_decimal/libmpdec/context.o: $(srcdir)/Modules/_decimal/libmpdec/context.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1424-
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/context.c
1425-
1426-
Modules/_decimal/libmpdec/convolute.o: $(srcdir)/Modules/_decimal/libmpdec/convolute.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1427-
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/convolute.c
1428-
1429-
Modules/_decimal/libmpdec/crt.o: $(srcdir)/Modules/_decimal/libmpdec/crt.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1430-
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/crt.c
1431-
1432-
Modules/_decimal/libmpdec/difradix2.o: $(srcdir)/Modules/_decimal/libmpdec/difradix2.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1433-
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/difradix2.c
1434-
1435-
Modules/_decimal/libmpdec/fnt.o: $(srcdir)/Modules/_decimal/libmpdec/fnt.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1436-
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/fnt.c
1437-
1438-
Modules/_decimal/libmpdec/fourstep.o: $(srcdir)/Modules/_decimal/libmpdec/fourstep.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1439-
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/fourstep.c
1440-
1441-
Modules/_decimal/libmpdec/io.o: $(srcdir)/Modules/_decimal/libmpdec/io.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1442-
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/io.c
1443-
1444-
Modules/_decimal/libmpdec/mpalloc.o: $(srcdir)/Modules/_decimal/libmpdec/mpalloc.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1445-
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/mpalloc.c
1446-
1447-
Modules/_decimal/libmpdec/mpdecimal.o: $(srcdir)/Modules/_decimal/libmpdec/mpdecimal.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1448-
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/mpdecimal.c
1449-
1450-
Modules/_decimal/libmpdec/mpsignal.o: $(srcdir)/Modules/_decimal/libmpdec/mpsignal.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1451-
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/mpsignal.c
1452-
1453-
Modules/_decimal/libmpdec/numbertheory.o: $(srcdir)/Modules/_decimal/libmpdec/numbertheory.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1454-
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/numbertheory.c
1455-
1456-
Modules/_decimal/libmpdec/sixstep.o: $(srcdir)/Modules/_decimal/libmpdec/sixstep.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1457-
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/sixstep.c
1458-
1459-
Modules/_decimal/libmpdec/transpose.o: $(srcdir)/Modules/_decimal/libmpdec/transpose.c $(LIBMPDEC_HEADERS) $(PYTHON_HEADERS)
1460-
$(CC) -c $(LIBMPDEC_CFLAGS) -o $@ $(srcdir)/Modules/_decimal/libmpdec/transpose.c
1461-
1462-
$(LIBMPDEC_A): $(LIBMPDEC_OBJS)
1463-
-rm -f $@
1464-
$(AR) $(ARFLAGS) $@ $(LIBMPDEC_OBJS)
1465-
14661371
##########################################################################
14671372
# Build static libexpat.a
14681373
LIBEXPAT_CFLAGS=@LIBEXPAT_CFLAGS@ $(PY_STDMODULE_CFLAGS) $(CCSHARED)

0 commit comments

Comments
 (0)