From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DBB581581D3 for ; Sun, 26 May 2024 14:28:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B987E29E8; Sun, 26 May 2024 14:28:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1623AE29E8 for ; Sun, 26 May 2024 14:28:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5F148343060 for ; Sun, 26 May 2024 14:28:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BCBC01736 for ; Sun, 26 May 2024 14:28:43 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1716731934.bb5fe8ba348915acb41d4e87722da7f012772a9f.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/numpy/files/, dev-python/numpy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/numpy/files/numpy-2.0.0_rc2-gcc14.patch dev-python/numpy/numpy-2.0.0_rc2-r1.ebuild dev-python/numpy/numpy-2.0.0_rc2.ebuild X-VCS-Directories: dev-python/numpy/files/ dev-python/numpy/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: bb5fe8ba348915acb41d4e87722da7f012772a9f X-VCS-Branch: master Date: Sun, 26 May 2024 14:28:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b1e6d032-c93b-4c9a-b931-f514ed841a26 X-Archives-Hash: 3ac763800f406d2e63447762c0887264 commit: bb5fe8ba348915acb41d4e87722da7f012772a9f Author: Michał Górny gentoo org> AuthorDate: Sun May 26 13:58:54 2024 +0000 Commit: Michał Górny gentoo 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 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 +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