Merge pull request #24591 from charris/backport-24584

charris · web-flow · commit 7deb08791bc1 · 2023-08-30T09:58:19.000-06:00
BLD: fix ``_umath_linalg`` dependencies
diff --git a/numpy/linalg/meson.build b/numpy/linalg/meson.build
@@ -1,35 +1,37 @@
+# Note that `python_xerbla.c` was excluded on Windows in setup.py;
+# unclear why and it seems needed, so unconditionally used here.
 lapack_lite_sources = [
-  'lapack_lite/f2c.c',
-  'lapack_lite/f2c_c_lapack.c',
-  'lapack_lite/f2c_d_lapack.c',
-  'lapack_lite/f2c_s_lapack.c',
-  'lapack_lite/f2c_z_lapack.c',
-  'lapack_lite/f2c_blas.c',
-  'lapack_lite/f2c_config.c',
-  'lapack_lite/f2c_lapack.c',
   'lapack_lite/python_xerbla.c',
 ]
-
-# TODO: ILP64 support
-
-lapack_lite_module_src = ['lapack_litemodule.c']
 if not have_lapack
-  warning('LAPACK was not found, NumPy is using an unoptimized, naive build from sources!')
-  lapack_lite_module_src += lapack_lite_sources
+  lapack_lite_sources += [
+    'lapack_lite/f2c.c',
+    'lapack_lite/f2c_c_lapack.c',
+    'lapack_lite/f2c_d_lapack.c',
+    'lapack_lite/f2c_s_lapack.c',
+    'lapack_lite/f2c_z_lapack.c',
+    'lapack_lite/f2c_blas.c',
+    'lapack_lite/f2c_config.c',
+    'lapack_lite/f2c_lapack.c',
+  ]
 endif
 
 py.extension_module('lapack_lite',
-  lapack_lite_module_src,
+  [
+    'lapack_litemodule.c',
+    lapack_lite_sources,
+  ],
   dependencies: [np_core_dep, blas_dep, lapack_dep],
   install: true,
   subdir: 'numpy/linalg',
 )
 
-_umath_linalg_src = ['umath_linalg.cpp'] + lapack_lite_sources
-
 py.extension_module('_umath_linalg',
-  _umath_linalg_src,
-  dependencies: np_core_dep,
+  [
+    'umath_linalg.cpp',
+    lapack_lite_sources,
+  ],
+  dependencies: [np_core_dep, blas_dep, lapack_dep],
   link_with: npymath_lib,
   install: true,
   subdir: 'numpy/linalg',
