Mon Jan 15 17:50:34 2024 UTC (132d)
py-numpy: fix build with Python 3.12

The upstream code has moved and changed and it's hard to see what/when,
but I've tried to make it match what upstream is doing now.


(wiz)
diff -r1.118 -r1.119 pkgsrc/math/py-numpy/Makefile
diff -r1.87 -r1.88 pkgsrc/math/py-numpy/distinfo
diff -r0 -r1.1 pkgsrc/math/py-numpy/patches/patch-numpy_core_code__generators_generate__numpy__api.py
diff -r0 -r1.1 pkgsrc/math/py-numpy/patches/patch-numpy_core_code__generators_generate__ufunc__api.py
Tue Jan 16 02:50:34 2024
Thu Jan 1 09:00:00 1970
pkgsrc/math/py-numpy/patches/patch-numpy_core_code__generators_generate__numpy__api.py,v
anoncvs not yet been updated
Tue Jan 16 02:50:34 2024
Thu Jan 1 09:00:00 1970
pkgsrc/math/py-numpy/patches/patch-numpy_core_code__generators_generate__ufunc__api.py,v
anoncvs not yet been updated
cvs diff -r1.118 -r1.119 pkgsrc/math/py-numpy/Makefile (expand / switch to unified diff)

--- pkgsrc/math/py-numpy/Makefile 2024/01/04 22:06:13 1.118
+++ pkgsrc/math/py-numpy/Makefile 2024/01/15 17:50:34 1.119
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.118 2024/01/04 22:06:13 adam Exp $ 1# $NetBSD: Makefile,v 1.119 2024/01/15 17:50:34 wiz Exp $
2 2
3DISTNAME= numpy-1.26.3 3DISTNAME= numpy-1.26.3
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
5CATEGORIES= math python 5CATEGORIES= math python
6MASTER_SITES= ${MASTER_SITE_PYPI:=n/numpy/} 6MASTER_SITES= ${MASTER_SITE_PYPI:=n/numpy/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://www.numpy.org/ 9HOMEPAGE= https://www.numpy.org/
10COMMENT= Array processing for numbers, strings, records, and objects 10COMMENT= Array processing for numbers, strings, records, and objects
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13TOOL_DEPENDS+= ${PYPKGPREFIX}-meson_python-[0-9]*:../../devel/py-meson_python 13TOOL_DEPENDS+= ${PYPKGPREFIX}-meson_python-[0-9]*:../../devel/py-meson_python
14TOOL_DEPENDS+= ${PYPKGPREFIX}-cython-[0-9]*:../../devel/py-cython 14TOOL_DEPENDS+= ${PYPKGPREFIX}-cython-[0-9]*:../../devel/py-cython
@@ -70,31 +70,33 @@ BLAS_C_INTERFACE= yes @@ -70,31 +70,33 @@ BLAS_C_INTERFACE= yes
70# Meson build uses pkg-config since 1.26.2 (or elaborate own logic not 70# Meson build uses pkg-config since 1.26.2 (or elaborate own logic not
71# suitable here) and guesses for cblas if blas lib does not contain the 71# suitable here) and guesses for cblas if blas lib does not contain the
72# C interface. That covers netlib for us, and openblas builds serve 72# C interface. That covers netlib for us, and openblas builds serve
73# all APIs. 73# all APIs.
74WHEEL_ARGS+= -Csetup-args=-Dblas=${BLAS_PC} 74WHEEL_ARGS+= -Csetup-args=-Dblas=${BLAS_PC}
75WHEEL_ARGS+= -Csetup-args=-Dlapack=${LAPACK_PC} 75WHEEL_ARGS+= -Csetup-args=-Dlapack=${LAPACK_PC}
76 76
77# Remove invalid __STDC_VERSION__ setting 77# Remove invalid __STDC_VERSION__ setting
78BUILDLINK_TRANSFORM.SunOS+= rm:-D__STDC_VERSION__=0 78BUILDLINK_TRANSFORM.SunOS+= rm:-D__STDC_VERSION__=0
79 79
80pre-configure: 80pre-configure:
81 ${LN} -sf ${PREFIX}/bin/cython-${PYVERSSUFFIX} ${BUILDLINK_DIR}/bin/cython 81 ${LN} -sf ${PREFIX}/bin/cython-${PYVERSSUFFIX} ${BUILDLINK_DIR}/bin/cython
82 82
 83# Files don't exist with Python 3.12, so add '-f' to ${RM}
 84# (Please check if this is still necessary after updates.)
83post-install: 85post-install:
84 ${RM} ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/command/config.py.orig 86 ${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/command/config.py.orig
85 ${RM} ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/fcompiler/__init__.py.orig 87 ${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/fcompiler/__init__.py.orig
86 ${RM} ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/fcompiler/g95.py.orig 88 ${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/fcompiler/g95.py.orig
87 ${RM} ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/fcompiler/gnu.py.orig 89 ${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/fcompiler/gnu.py.orig
88 ${RM} ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/log.py.orig 90 ${RM} -f ${DESTDIR}${PREFIX}/${PYSITELIB}/numpy/distutils/log.py.orig
89 cd ${DESTDIR}${PREFIX}/bin && ${MV} f2py f2py-${PYVERSSUFFIX} || ${TRUE} 91 cd ${DESTDIR}${PREFIX}/bin && ${MV} f2py f2py-${PYVERSSUFFIX} || ${TRUE}
90 92
91# as of 1.26.1 93# as of 1.26.1
92# 28 failed, 38180 passed, 200 skipped, 1304 deselected, 33 xfailed, 1 xpassed, 52 warnings 94# 28 failed, 38180 passed, 200 skipped, 1304 deselected, 33 xfailed, 1 xpassed, 52 warnings
93do-test: 95do-test:
94 cd ${WRKDIR} && \ 96 cd ${WRKDIR} && \
95 ${SETENV} ${TEST_ENV} PYTHONPATH=${DESTDIR}${PREFIX}/${PYSITELIB} ${PYTHONBIN} -c "import numpy; numpy.test()" 97 ${SETENV} ${TEST_ENV} PYTHONPATH=${DESTDIR}${PREFIX}/${PYSITELIB} ${PYTHONBIN} -c "import numpy; numpy.test()"
96 98
97.include "../../lang/python/application.mk" 99.include "../../lang/python/application.mk"
98.include "../../lang/python/wheel.mk" 100.include "../../lang/python/wheel.mk"
99.include "../../mk/blas.buildlink3.mk" 101.include "../../mk/blas.buildlink3.mk"
100.include "../../mk/bsd.pkg.mk" 102.include "../../mk/bsd.pkg.mk"
cvs diff -r1.87 -r1.88 pkgsrc/math/py-numpy/distinfo (expand / switch to unified diff)

--- pkgsrc/math/py-numpy/distinfo 2024/01/04 22:06:13 1.87
+++ pkgsrc/math/py-numpy/distinfo 2024/01/15 17:50:34 1.88
@@ -1,17 +1,19 @@ @@ -1,17 +1,19 @@
1$NetBSD: distinfo,v 1.87 2024/01/04 22:06:13 adam Exp $ 1$NetBSD: distinfo,v 1.88 2024/01/15 17:50:34 wiz Exp $
2 2
3BLAKE2s (numpy-1.26.3.tar.gz) = 9d0b23c2d8a1866ae82302a00fe0e88078dd221a78379326e49b0042fe745348 3BLAKE2s (numpy-1.26.3.tar.gz) = 9d0b23c2d8a1866ae82302a00fe0e88078dd221a78379326e49b0042fe745348
4SHA512 (numpy-1.26.3.tar.gz) = 25556b41e2db9cfc52c1dfa61b05e4fc1b7b6df3b169f365375575d1146857fdb5ff91ca1508b968c296b7a06e5c6d95e82c41cdc3561587a46d3aa178f6305d 4SHA512 (numpy-1.26.3.tar.gz) = 25556b41e2db9cfc52c1dfa61b05e4fc1b7b6df3b169f365375575d1146857fdb5ff91ca1508b968c296b7a06e5c6d95e82c41cdc3561587a46d3aa178f6305d
5Size (numpy-1.26.3.tar.gz) = 15679696 bytes 5Size (numpy-1.26.3.tar.gz) = 15679696 bytes
 6SHA1 (patch-numpy_core_code__generators_generate__numpy__api.py) = 6b2ec1ec67408b9d20ec4917356f0b725e9ea266
 7SHA1 (patch-numpy_core_code__generators_generate__ufunc__api.py) = 974bb5b9507fe404a3aacda9cf4176993f74e048
6SHA1 (patch-numpy_core_include_numpy_npy__common.h) = 354e336b98f634b6298d0b1d0e85ef1a9d240bff 8SHA1 (patch-numpy_core_include_numpy_npy__common.h) = 354e336b98f634b6298d0b1d0e85ef1a9d240bff
7SHA1 (patch-numpy_core_setup.py) = 01f90b7eb700cfa51edded31498c2de4c3850848 9SHA1 (patch-numpy_core_setup.py) = 01f90b7eb700cfa51edded31498c2de4c3850848
8SHA1 (patch-numpy_core_src_common_mem__overlap.c) = 10d65c7f8ba740ce2bae5ad47ef3162cd2c5a40b 10SHA1 (patch-numpy_core_src_common_mem__overlap.c) = 10d65c7f8ba740ce2bae5ad47ef3162cd2c5a40b
9SHA1 (patch-numpy_core_src_npymath_npy__math__private.h) = e3b8e751fd0b6b6c6794d714aa5f60dfe9d7f421 11SHA1 (patch-numpy_core_src_npymath_npy__math__private.h) = e3b8e751fd0b6b6c6794d714aa5f60dfe9d7f421
10SHA1 (patch-numpy_distutils_command_config.py) = eb37d28482689703e0c1a264f9768409cf8bb4b6 12SHA1 (patch-numpy_distutils_command_config.py) = eb37d28482689703e0c1a264f9768409cf8bb4b6
11SHA1 (patch-numpy_distutils_fcompiler_____init____.py) = 49d070da5b48bd9818b37ac3254341fa68503c53 13SHA1 (patch-numpy_distutils_fcompiler_____init____.py) = 49d070da5b48bd9818b37ac3254341fa68503c53
12SHA1 (patch-numpy_distutils_fcompiler_g95.py) = be73b64a3e551df998b6a904d6db762bf28a98ed 14SHA1 (patch-numpy_distutils_fcompiler_g95.py) = be73b64a3e551df998b6a904d6db762bf28a98ed
13SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 1ab3fd7b3f42328f4094f1b21a65c05ae4d975b7 15SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 1ab3fd7b3f42328f4094f1b21a65c05ae4d975b7
14SHA1 (patch-numpy_distutils_log.py) = 4c968b934fb24da096a1f4d2cd4ebb2e3fd92334 16SHA1 (patch-numpy_distutils_log.py) = 4c968b934fb24da096a1f4d2cd4ebb2e3fd92334
15SHA1 (patch-numpy_linalg_lapack__litemodule.c) = e97ec871c2f33c3121b3c8471a9e5a74c3c798c8 17SHA1 (patch-numpy_linalg_lapack__litemodule.c) = e97ec871c2f33c3121b3c8471a9e5a74c3c798c8
16SHA1 (patch-numpy_linalg_setup.py) = 867a2aba13ebb60b67ac2824a4cb1aff2e1231ee 18SHA1 (patch-numpy_linalg_setup.py) = 867a2aba13ebb60b67ac2824a4cb1aff2e1231ee
17SHA1 (patch-numpy_linalg_umath__linalg.cpp) = 4e02f3b4f6550653e851b0b6819f7048aac297e6 19SHA1 (patch-numpy_linalg_umath__linalg.cpp) = 4e02f3b4f6550653e851b0b6819f7048aac297e6
File Added: pkgsrc/math/py-numpy/patches/patch-numpy_core_code__generators_generate__numpy__api.py
File Added: pkgsrc/math/py-numpy/patches/patch-numpy_core_code__generators_generate__ufunc__api.py