CVS commit: pkgsrc/math/py-numpy

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Wed May 13 02:10:58 UTC 2026

Modified Files:
        pkgsrc/math/py-numpy: Makefile distinfo
Added Files:
        pkgsrc/math/py-numpy/patches:
            patch-numpy___core_src_npymath_npy__math.c
Removed Files:
        pkgsrc/math/py-numpy/patches:
            patch-numpy___core_src_common_mem__overlap.c

Log Message:
math/py-numpy: Tweak workaround for missing log2l/log1pl/expm1l.

1. Put it in npy_math.c as needed by _umath_linalg.so.

2. Limit it to NetBSD<10, since NetBSD>=10 has at least stubs (just
   like this workaround implements, in terms of double functions) if
   not proper long double implementations (NetBSD>=11).

Fixes:

>>> import numpy
...
ImportError: /home/riastradh/pkgsrc/current/pkg/lib/python3.11/site-packages/numpy/linalg/_umath_linalg.so: Undefined PLT symbol "log1pl" (symnum = 20)

PR pkg/60256: devel/py-numpy: log1pl workaround no longer works around


To generate a diff of this commit:
cvs rdiff -u -r1.149 -r1.150 pkgsrc/math/py-numpy/Makefile
cvs rdiff -u -r1.111 -r1.112 pkgsrc/math/py-numpy/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/math/py-numpy/patches/patch-numpy___core_src_common_mem__overlap.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/math/py-numpy/patches/patch-numpy___core_src_npymath_npy__math.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/math/py-numpy/Makefile
diff -u pkgsrc/math/py-numpy/Makefile:1.149 pkgsrc/math/py-numpy/Makefile:1.150
--- pkgsrc/math/py-numpy/Makefile:1.149 Tue Mar 31 13:09:01 2026
+++ pkgsrc/math/py-numpy/Makefile       Wed May 13 02:10:58 2026
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.149 2026/03/31 13:09:01 adam Exp $
+# $NetBSD: Makefile,v 1.150 2026/05/13 02:10:58 riastradh Exp $
 
 DISTNAME=      numpy-2.4.4
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    math python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=n/numpy/}
 

Index: pkgsrc/math/py-numpy/distinfo
diff -u pkgsrc/math/py-numpy/distinfo:1.111 pkgsrc/math/py-numpy/distinfo:1.112
--- pkgsrc/math/py-numpy/distinfo:1.111 Tue Mar 31 13:09:01 2026
+++ pkgsrc/math/py-numpy/distinfo       Wed May 13 02:10:58 2026
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.111 2026/03/31 13:09:01 adam Exp $
+$NetBSD: distinfo,v 1.112 2026/05/13 02:10:58 riastradh Exp $
 
 BLAKE2s (numpy-2.4.4.tar.gz) = 1e67c985ecf95adacaad2267e50d78a1f5ac51bd52bdb85e21685dcd306fd0fc
 SHA512 (numpy-2.4.4.tar.gz) = 7abec48faf957449248194683aaf2d97c2424ab9ab22cfa6e6676e79185da4ad971839f24b73c8576e582f91e7d941a8fc2b1550ee84b26d8ee6273d1009deee
 Size (numpy-2.4.4.tar.gz) = 20731587 bytes
 SHA1 (patch-numpy___core_feature__detection__misc.h) = c0f4d318c93fcd0e36c34c549c7778350b8a6ea5
 SHA1 (patch-numpy___core_include_numpy_npy__common.h) = 175cd8f64af681949c3e8bfde064c93908433ea2
-SHA1 (patch-numpy___core_src_common_mem__overlap.c) = 709f140252e8582c325d30fa0289dda3d9a5c888
+SHA1 (patch-numpy___core_src_npymath_npy__math.c) = b28f1a9730d98a18b2f4f97c1c356ca8ad80903d
 SHA1 (patch-numpy_distutils_command_config.py) = eb37d28482689703e0c1a264f9768409cf8bb4b6
 SHA1 (patch-numpy_distutils_fcompiler_____init____.py) = 49d070da5b48bd9818b37ac3254341fa68503c53
 SHA1 (patch-numpy_distutils_fcompiler_g95.py) = be73b64a3e551df998b6a904d6db762bf28a98ed
 SHA1 (patch-numpy_distutils_fcompiler_gnu.py) = 1ab3fd7b3f42328f4094f1b21a65c05ae4d975b7
-SHA1 (patch-numpy_distutils_log.py) = f9bc3f03a5f9a56b9eb561f36467bae549500bc4
+SHA1 (patch-numpy_distutils_log.py) = 8f0d1a7907b5569a529d547b965ee99ef1710460
 SHA1 (patch-numpy_linalg_lapack__litemodule.c) = e97ec871c2f33c3121b3c8471a9e5a74c3c798c8

Added files:

Index: pkgsrc/math/py-numpy/patches/patch-numpy___core_src_npymath_npy__math.c
diff -u /dev/null pkgsrc/math/py-numpy/patches/patch-numpy___core_src_npymath_npy__math.c:1.1
--- /dev/null   Wed May 13 02:10:58 2026
+++ pkgsrc/math/py-numpy/patches/patch-numpy___core_src_npymath_npy__math.c     Wed May 13 02:10:58 2026
@@ -0,0 +1,28 @@
+$NetBSD: patch-numpy___core_src_npymath_npy__math.c,v 1.1 2026/05/13 02:10:58 riastradh Exp $
+
+Workaround for https://github.com/numpy/numpy/issues/23379
+ImportError: /home/riastradh/pkgsrc/current/pkg/lib/python3.11/site-packages/numpy/linalg/_umath_linalg.so: Undefined PLT symbol "log1pl" (symnum = 20)
+
+--- numpy/_core/src/npymath/npy_math.c.orig    2026-03-28 23:41:33.000000000 +0000
++++ numpy/_core/src/npymath/npy_math.c
+@@ -7,3 +7,20 @@
+ 
+ #define NPY_INLINE_MATH 0
+ #include "npy_math_internal.h"
++
++#ifdef __NetBSD__
++#include <sys/param.h>
++#if __NetBSD_Version__ < 1000000000
++/* hack for missing log2l() symbol - see https://github.com/numpy/numpy/issues/23379 */
++/* in this file because it's included by all _multiarray_* so files */
++long double log2l(long double arg) {
++    return log2(arg);
++}
++long double log1pl(long double arg) {
++    return log1p(arg);
++}
++long double expm1l(long double arg) {
++    return expm1(arg);
++}
++#endif
++#endif