commit: daa40a2707195cae8bfe8ae1d98a730bcfdd30bd Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Mon Dec 11 13:42:10 2023 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Dec 11 13:43:15 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daa40a27
dev-python/numpy: Update arches patch to cover mips as well Bug: https://bugs.gentoo.org/908739 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> ...py-1.26.1-alpha.patch => numpy-1.26.1-more-arches.patch} | 13 ++----------- dev-python/numpy/numpy-1.26.1.ebuild | 5 ++++- dev-python/numpy/numpy-1.26.2.ebuild | 5 ++++- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dev-python/numpy/files/numpy-1.26.1-alpha.patch b/dev-python/numpy/files/numpy-1.26.1-more-arches.patch similarity index 59% rename from dev-python/numpy/files/numpy-1.26.1-alpha.patch rename to dev-python/numpy/files/numpy-1.26.1-more-arches.patch index a0b2ca2eda91..a6f622517521 100644 --- a/dev-python/numpy/files/numpy-1.26.1-alpha.patch +++ b/dev-python/numpy/files/numpy-1.26.1-more-arches.patch @@ -1,14 +1,5 @@ -https://bugs.gentoo.org/909738 https://github.com/numpy/numpy/pull/25078 - -commit 43aaf2093d8dfb3c1fea5d409ea4aa1d0f77816f -Author: matoro <[email protected]> -Date: Mon Nov 6 10:21:32 2023 -0500 - - BUG: alpha doesn't use REAL(10) - - Same as e.g. loongarch per gh-24904. At this point seems like it should - be more of an exclude list than an include one... +https://github.com/numpy/numpy/pull/25254 diff --git a/numpy/f2py/crackfortran.py b/numpy/f2py/crackfortran.py index f352bbaa2..d17b052f9 100755 @@ -19,7 +10,7 @@ index f352bbaa2..d17b052f9 100755 return 8 machine = platform.machine().lower() - if machine.startswith(('aarch64', 'arm64', 'loongarch', 'power', 'ppc', 'riscv', 's390x', 'sparc')): -+ if machine.startswith(('aarch64', 'alpha', 'arm64', 'loongarch', 'power', 'ppc', 'riscv', 's390x', 'sparc')): ++ if machine.startswith(('aarch64', 'alpha', 'arm64', 'loongarch', 'mips', 'power', 'ppc', 'riscv', 's390x', 'sparc')): if p <= 33: return 16 else: diff --git a/dev-python/numpy/numpy-1.26.1.ebuild b/dev-python/numpy/numpy-1.26.1.ebuild index 25c71df50516..f31fdfc7dce1 100644 --- a/dev-python/numpy/numpy-1.26.1.ebuild +++ b/dev-python/numpy/numpy-1.26.1.ebuild @@ -49,7 +49,10 @@ BDEPEND=" >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] ) " -PATCHES=( "${FILESDIR}/${PN}-1.26.1-alpha.patch" ) + +PATCHES=( + "${FILESDIR}/${PN}-1.26.1-more-arches.patch" +) EPYTEST_XDIST=1 distutils_enable_tests pytest diff --git a/dev-python/numpy/numpy-1.26.2.ebuild b/dev-python/numpy/numpy-1.26.2.ebuild index 845d598fd604..9af7c8427708 100644 --- a/dev-python/numpy/numpy-1.26.2.ebuild +++ b/dev-python/numpy/numpy-1.26.2.ebuild @@ -49,7 +49,10 @@ BDEPEND=" >=dev-python/pytz-2019.3[${PYTHON_USEDEP}] ) " -PATCHES=( "${FILESDIR}/${PN}-1.26.1-alpha.patch" ) + +PATCHES=( + "${FILESDIR}/${PN}-1.26.1-more-arches.patch" +) EPYTEST_XDIST=1 distutils_enable_tests pytest
