commit: bb5fe8ba348915acb41d4e87722da7f012772a9f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun May 26 13:58:54 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 26 13:58:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb5fe8ba
dev-python/numpy: Backport emitted code fix to fix scipy w/ GCC-14
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/numpy/files/numpy-2.0.0_rc2-gcc14.patch | 23 ++++++++++++++++++++++
...-2.0.0_rc2.ebuild => numpy-2.0.0_rc2-r1.ebuild} | 5 +++++
2 files changed, 28 insertions(+)
diff --git a/dev-python/numpy/files/numpy-2.0.0_rc2-gcc14.patch
b/dev-python/numpy/files/numpy-2.0.0_rc2-gcc14.patch
new file mode 100644
index 000000000000..f3ed3727520d
--- /dev/null
+++ b/dev-python/numpy/files/numpy-2.0.0_rc2-gcc14.patch
@@ -0,0 +1,23 @@
+From f3bc38235bf39a630035920e29f2f883cae5fffe Mon Sep 17 00:00:00 2001
+From: Matti Picus <matti.pi...@gmail.com>
+Date: Sun, 26 May 2024 11:25:43 +0300
+Subject: [PATCH 1/3] BUG: cast missing in PyPy-specific f2py code
+
+---
+ numpy/f2py/cb_rules.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/numpy/f2py/cb_rules.py b/numpy/f2py/cb_rules.py
+index 721e075b6c73..faf8dd401301 100644
+--- a/numpy/f2py/cb_rules.py
++++ b/numpy/f2py/cb_rules.py
+@@ -122,7 +122,7 @@
+ #setdims#
+ #ifdef PYPY_VERSION
+ #define CAPI_ARGLIST_SETITEM(idx, value) PyList_SetItem((PyObject
*)capi_arglist_list, idx, value)
+- capi_arglist_list = PySequence_List(capi_arglist);
++ capi_arglist_list = PySequence_List((PyObject *)capi_arglist);
+ if (capi_arglist_list == NULL) goto capi_fail;
+ #else
+ #define CAPI_ARGLIST_SETITEM(idx, value) PyTuple_SetItem((PyObject
*)capi_arglist, idx, value)
+
diff --git a/dev-python/numpy/numpy-2.0.0_rc2.ebuild
b/dev-python/numpy/numpy-2.0.0_rc2-r1.ebuild
similarity index 98%
rename from dev-python/numpy/numpy-2.0.0_rc2.ebuild
rename to dev-python/numpy/numpy-2.0.0_rc2-r1.ebuild
index 0d97ca09f939..7cd370900a32 100644
--- a/dev-python/numpy/numpy-2.0.0_rc2.ebuild
+++ b/dev-python/numpy/numpy-2.0.0_rc2-r1.ebuild
@@ -52,6 +52,11 @@ EPYTEST_XDIST=1
distutils_enable_tests pytest
python_prepare_all() {
+ local PATCHES=(
+ # https://github.com/numpy/numpy/pull/26534
+ "${FILESDIR}/${P}-gcc14.patch"
+ )
+
append-flags -fno-strict-aliasing
distutils-r1_python_prepare_all
