From c1d785c5ae6829fe4566200be5da4a39ef8c18bf Mon Sep 17 00:00:00 2001 From: Karolina Surma Date: Wed, 20 Mar 2024 15:48:00 +0100 Subject: [PATCH] Remove internal usage of @LIBPYTHON@ --- ...move-all-internal-usage-of-libpython.patch | 37 +++++++++++++++++++ python3.13.spec | 11 +++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 00424-gh-116745-remove-all-internal-usage-of-libpython.patch diff --git a/00424-gh-116745-remove-all-internal-usage-of-libpython.patch b/00424-gh-116745-remove-all-internal-usage-of-libpython.patch new file mode 100644 index 0000000..4c6f8fe --- /dev/null +++ b/00424-gh-116745-remove-all-internal-usage-of-libpython.patch @@ -0,0 +1,37 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Thomas A Caswell +Date: Wed, 13 Mar 2024 14:05:35 -0400 +Subject: [PATCH] 00424: gh-116745: remove all internal usage of @LIBPYTHON@ + +Follow on to https://github.com/python/cpython/pull/115780 . + +Without this change numpy's build is broken. +--- + Misc/python-config.sh.in | 2 +- + Misc/python.pc.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Misc/python-config.sh.in b/Misc/python-config.sh.in +index eb02223ddc..c3c0b34fc1 100644 +--- a/Misc/python-config.sh.in ++++ b/Misc/python-config.sh.in +@@ -46,7 +46,7 @@ LIBM="@LIBM@" + LIBC="@LIBC@" + SYSLIBS="$LIBM $LIBC" + ABIFLAGS="@ABIFLAGS@" +-LIBS="@LIBPYTHON@ @LIBS@ $SYSLIBS" ++LIBS="@MODULE_LDFLAGS@ @LIBS@ $SYSLIBS" + LIBS_EMBED="-lpython${VERSION}${ABIFLAGS} @LIBS@ $SYSLIBS" + BASECFLAGS="@BASECFLAGS@" + LDLIBRARY="@LDLIBRARY@" +diff --git a/Misc/python.pc.in b/Misc/python.pc.in +index 027dba3858..c2c740e82b 100644 +--- a/Misc/python.pc.in ++++ b/Misc/python.pc.in +@@ -9,5 +9,5 @@ Description: Build a C extension for Python + Requires: + Version: @VERSION@ + Libs.private: @LIBS@ +-Libs: -L${libdir} @LIBPYTHON@ ++Libs: -L${libdir} @MODULE_LDFLAGS@ + Cflags: -I${includedir}/python@VERSION@@ABIFLAGS@ diff --git a/python3.13.spec b/python3.13.spec index b36ae29..f9b750e 100644 --- a/python3.13.spec +++ b/python3.13.spec @@ -385,6 +385,14 @@ Patch251: 00251-change-user-install-location.patch # https://github.com/GrahamDumpleton/mod_wsgi/issues/730 Patch371: 00371-revert-bpo-1596321-fix-threading-_shutdown-for-the-main-thread-gh-28549-gh-28589.patch +# 00424 # 767f9ca0f729a52808648bca8786fe046c25a016 +# gh-116745: remove all internal usage of @LIBPYTHON@ +# +# Follow on to https://github.com/python/cpython/pull/115780 . +# +# Without this change numpy's build is broken. +Patch424: 00424-gh-116745-remove-all-internal-usage-of-libpython.patch + # (New patches go here ^^^) # # When adding new patches to "python" and "python3" in Fedora, EL, etc., @@ -1672,7 +1680,7 @@ CheckPython freethreading # ====================================================== %changelog -* Wed Mar 13 2024 Miro Hrončok - 3.13.0~a5-2 +* Wed Mar 13 2024 Python Maint - 3.13.0~a5-2 - Move all test modules to the python3.13-test package, namely: - __phello__ - _xxinterpqueues @@ -1680,6 +1688,7 @@ CheckPython freethreading - xxlimited - xxlimited_35 - xxsubtype +- Remove internal usage of @LIBPYTHON@ * Wed Mar 13 2024 Miro Hrončok - 3.13.0~a5-1 - Update to Python 3.13.0a5