81 lines
3.1 KiB
Diff
81 lines
3.1 KiB
Diff
From e8f0c81a5fed1cdb8d9b1a9c7545686344655c9a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hrn=C4=8Diar?= <thrnciar@redhat.com>
|
|
Date: Mon, 27 Oct 2025 11:32:50 +0100
|
|
Subject: [PATCH] compatibility with meson 1.4.1
|
|
|
|
---
|
|
scipy/linalg/meson.build | 4 ++--
|
|
scipy/optimize/meson.build | 2 +-
|
|
scipy/spatial/meson.build | 2 +-
|
|
scipy/special/meson.build | 4 ++--
|
|
4 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/scipy/linalg/meson.build b/scipy/linalg/meson.build
|
|
index 77caa98..9d5e67c 100644
|
|
--- a/scipy/linalg/meson.build
|
|
+++ b/scipy/linalg/meson.build
|
|
@@ -40,13 +40,13 @@ linalg_init_cython_gen = generator(cython,
|
|
linalg_init_utils_cython_gen = generator(cython,
|
|
arguments : cython_args,
|
|
output : '@BASENAME@.c',
|
|
- depends : [_cython_tree, __init__py, _cy_array_utils_pxd, cython_lapack_pxd])
|
|
+ depends : [_cython_tree, __init__py, _cy_array_utils_pxd, cython_linalg])
|
|
|
|
# pyx -> c, pyx -> cpp generators, depending on copied pxd files and init
|
|
linalg_cython_gen = generator(cython,
|
|
arguments : cython_args,
|
|
output : '@BASENAME@.c',
|
|
- depends : [_cython_tree, __init__py, cython_blas_pxd])#, cython_linalg])
|
|
+ depends : [_cython_tree, __init__py, cython_linalg])#, cython_linalg])
|
|
|
|
# fblas
|
|
fblas_module = custom_target('fblas_module',
|
|
diff --git a/scipy/optimize/meson.build b/scipy/optimize/meson.build
|
|
index 5ad9f4b..b01c6ca 100644
|
|
--- a/scipy/optimize/meson.build
|
|
+++ b/scipy/optimize/meson.build
|
|
@@ -124,7 +124,7 @@ _cython_tree += fs.copyfile('__init__.pxd')
|
|
opt_gen = generator(cython,
|
|
arguments : cython_args,
|
|
output : '@BASENAME@.c',
|
|
- depends : [_cython_tree, cython_blas_pxd, cython_optimize_pxd, _dummy_init_optimize])
|
|
+ depends : [_cython_tree, cython_linalg, cython_optimize_pxd, _dummy_init_optimize])
|
|
|
|
py3.extension_module('_bglu_dense',
|
|
opt_gen.process('_bglu_dense.pyx'),
|
|
diff --git a/scipy/spatial/meson.build b/scipy/spatial/meson.build
|
|
index 8a1a047..810e20d 100644
|
|
--- a/scipy/spatial/meson.build
|
|
+++ b/scipy/spatial/meson.build
|
|
@@ -8,7 +8,7 @@ _spatial_pxd = [
|
|
spt_cython_gen = generator(cython,
|
|
arguments : cython_args,
|
|
output : '@BASENAME@.c',
|
|
- depends : [_cython_tree, _spatial_pxd, _lib_pxd, cython_lapack_pxd])
|
|
+ depends : [_cython_tree, _spatial_pxd, _lib_pxd, cython_linalg])
|
|
|
|
py3.extension_module('_qhull',
|
|
[spt_cython_gen.process('_qhull.pyx'),
|
|
diff --git a/scipy/special/meson.build b/scipy/special/meson.build
|
|
index eb840af..fc7993c 100644
|
|
--- a/scipy/special/meson.build
|
|
+++ b/scipy/special/meson.build
|
|
@@ -107,12 +107,12 @@ _cython_tree += fs.copyfile('__init__.pxd')
|
|
uf_cython_gen = generator(cython,
|
|
arguments : cython_args,
|
|
output : '@BASENAME@.c',
|
|
- depends : [_cython_tree, _ufuncs_pxi_pxd_sources, cython_special_pxd, cython_special[0]])
|
|
+ depends : [_cython_tree, _ufuncs_pxi_pxd_sources, cython_special_pxd, cython_special])
|
|
|
|
uf_cython_gen_cpp = generator(cython,
|
|
arguments : cython_cplus_args,
|
|
output : '@BASENAME@.cpp',
|
|
- depends : [_cython_tree, _ufuncs_pxi_pxd_sources, cython_special_pxd, cython_special[0]])
|
|
+ depends : [_cython_tree, _ufuncs_pxi_pxd_sources, cython_special_pxd, cython_special])
|
|
|
|
py3.extension_module('_ufuncs',
|
|
[
|
|
--
|
|
2.51.0
|
|
|