From bc04b90321873d82e342caa81e5f8e5a66cd86f8 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Mon, 29 Apr 2024 09:58:52 +0200 Subject: [PATCH 1/5] gh-115119: Update macOS installer to fetch and build libmpdecimal 2.5.1 --- Mac/BuildScript/build-installer.py | 11 +++++++++++ Modules/_sqlite/cursor.c | 1 + 2 files changed, 12 insertions(+) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 286df4862793fb..10c2a99a1ac449 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -378,6 +378,17 @@ def library_recipes(): '--disable-dependency-tracking', ] ), + dict( + name="libmpdec 2.5.1", + url="https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-2.5.1.tar.gz", + checksum="9f9cd4c041f99b5c49ffb7b59d9f12d95b683d88585608aa56a6307667b2b21f", + extra_cflags=( + "MACHINE=universal", + ), + configure_pre=[ + "--disable-cxx", + ] + ), ]) if not PYTHON_3: diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c index 950596ea82b568..32a983804bde5a 100644 --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -140,6 +140,7 @@ stmt_reset(pysqlite_Statement *self) Py_BEGIN_ALLOW_THREADS rc = sqlite3_reset(self->st); Py_END_ALLOW_THREADS + assert(rc == SQLITE_OK); } return rc; From 535c1308bdb142468c6bc8e2e6446083e7c3a6fa Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Mon, 29 Apr 2024 12:38:29 +0200 Subject: [PATCH 2/5] Revert spurious change --- Modules/_sqlite/cursor.c | 1 - 1 file changed, 1 deletion(-) diff --git a/Modules/_sqlite/cursor.c b/Modules/_sqlite/cursor.c index 32a983804bde5a..950596ea82b568 100644 --- a/Modules/_sqlite/cursor.c +++ b/Modules/_sqlite/cursor.c @@ -140,7 +140,6 @@ stmt_reset(pysqlite_Statement *self) Py_BEGIN_ALLOW_THREADS rc = sqlite3_reset(self->st); Py_END_ALLOW_THREADS - assert(rc == SQLITE_OK); } return rc; From 9bc8a60f4e431a553fd264931b31048f67b6b183 Mon Sep 17 00:00:00 2001 From: "Erlend E. Aasland" Date: Mon, 29 Apr 2024 14:40:33 +0200 Subject: [PATCH 3/5] Amend README and update CPython configure invocation --- Mac/BuildScript/README.rst | 2 ++ Mac/BuildScript/build-installer.py | 1 + 2 files changed, 3 insertions(+) diff --git a/Mac/BuildScript/README.rst b/Mac/BuildScript/README.rst index 4f74e7dc00520a..a9fae36ba28ae9 100644 --- a/Mac/BuildScript/README.rst +++ b/Mac/BuildScript/README.rst @@ -82,6 +82,7 @@ download them. * SQLite * XZ * libffi + * mpdecimal - uses system-supplied versions of third-party libraries @@ -111,6 +112,7 @@ download them. * SQLite * XZ * libffi + * mpdecimal - uses system-supplied versions of third-party libraries diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 10c2a99a1ac449..9bf117e9140449 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -1161,6 +1161,7 @@ def buildPython(): print(" NOTE: --with-mimalloc=no pending resolution of weak linking issues") runCommand("%s -C --enable-framework --enable-universalsdk=/ " "--with-mimalloc=no " + "--with-system-libmpdec " "--with-universal-archs=%s " "%s " "%s " From f7febe188cf93ca7687008fa34ca2637e4b03e6c Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Thu, 2 May 2024 18:00:10 -0400 Subject: [PATCH 4/5] fix library_recipes for mpdecimal --- Mac/BuildScript/build-installer.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 9bf117e9140449..70178d1aab4171 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -382,11 +382,9 @@ def library_recipes(): name="libmpdec 2.5.1", url="https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-2.5.1.tar.gz", checksum="9f9cd4c041f99b5c49ffb7b59d9f12d95b683d88585608aa56a6307667b2b21f", - extra_cflags=( - "MACHINE=universal", - ), configure_pre=[ "--disable-cxx", + "MACHINE=universal", ] ), ]) From 57bd0ad1e4a939f86148367c21460fc77f88122c Mon Sep 17 00:00:00 2001 From: Ned Deily Date: Fri, 3 May 2024 12:14:26 -0400 Subject: [PATCH 5/5] Use libmpdec 4.0.0 --- Mac/BuildScript/build-installer.py | 6 +++--- .../macOS/2024-05-03-12-13-27.gh-issue-115119.ltDtoR.rst | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 Misc/NEWS.d/next/macOS/2024-05-03-12-13-27.gh-issue-115119.ltDtoR.rst diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 70178d1aab4171..8386e407f49aa3 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -379,9 +379,9 @@ def library_recipes(): ] ), dict( - name="libmpdec 2.5.1", - url="https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-2.5.1.tar.gz", - checksum="9f9cd4c041f99b5c49ffb7b59d9f12d95b683d88585608aa56a6307667b2b21f", + name="libmpdec 4.0.0", + url="https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-4.0.0.tar.gz", + checksum="942445c3245b22730fd41a67a7c5c231d11cb1b9936b9c0f76334fb7d0b4468c", configure_pre=[ "--disable-cxx", "MACHINE=universal", diff --git a/Misc/NEWS.d/next/macOS/2024-05-03-12-13-27.gh-issue-115119.ltDtoR.rst b/Misc/NEWS.d/next/macOS/2024-05-03-12-13-27.gh-issue-115119.ltDtoR.rst new file mode 100644 index 00000000000000..693dcc72628282 --- /dev/null +++ b/Misc/NEWS.d/next/macOS/2024-05-03-12-13-27.gh-issue-115119.ltDtoR.rst @@ -0,0 +1 @@ +Update macOS installer to use libmpdecimal 4.0.0.