| 1 |
commit: 81245c75f8b75958ca76ab28e38f20353219fb0d |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 23 06:58:46 2022 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 26 21:12:29 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81245c75 |
| 7 |
|
| 8 |
dev-python/scipy: Pass -Dblas, -Dlapack via DISTUTILS_ARGS |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-python/scipy/scipy-1.9.3.ebuild | 11 +++++------ |
| 13 |
dev-python/scipy/scipy-1.9.9999.ebuild | 11 +++++------ |
| 14 |
2 files changed, 10 insertions(+), 12 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-python/scipy/scipy-1.9.3.ebuild b/dev-python/scipy/scipy-1.9.3.ebuild |
| 17 |
index 18e8c08b3222..7c62ef8bb35f 100644 |
| 18 |
--- a/dev-python/scipy/scipy-1.9.3.ebuild |
| 19 |
+++ b/dev-python/scipy/scipy-1.9.3.ebuild |
| 20 |
@@ -62,6 +62,7 @@ RDEPEND=" |
| 21 |
BDEPEND=" |
| 22 |
dev-lang/swig |
| 23 |
>=dev-python/cython-0.29.18[${PYTHON_USEDEP}] |
| 24 |
+ >=dev-python/meson-python-0.11[${PYTHON_USEDEP}] |
| 25 |
dev-python/pybind11[${PYTHON_USEDEP}] |
| 26 |
>=dev-util/meson-0.62.2 |
| 27 |
dev-util/patchelf |
| 28 |
@@ -70,10 +71,6 @@ BDEPEND=" |
| 29 |
fortran? ( dev-python/pythran[${PYTHON_USEDEP}] ) |
| 30 |
test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )" |
| 31 |
|
| 32 |
-PATCHES=( |
| 33 |
- "${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch |
| 34 |
-) |
| 35 |
- |
| 36 |
EPYTEST_DESELECT=( |
| 37 |
linalg/tests/test_decomp.py::TestSchur::test_sort |
| 38 |
linalg/tests/test_solvers.py::test_solve_discrete_are |
| 39 |
@@ -90,9 +87,11 @@ src_unpack() { |
| 40 |
} |
| 41 |
|
| 42 |
python_configure_all() { |
| 43 |
- # workaround stupid numpy distutils overrides, indirectly via pythran |
| 44 |
- export SETUPTOOLS_USE_DISTUTILS=stdlib |
| 45 |
export SCIPY_USE_PYTHRAN=$(usex fortran 1 0) |
| 46 |
+ DISTUTILS_ARGS=( |
| 47 |
+ -Dblas=blas |
| 48 |
+ -Dlapack=lapack |
| 49 |
+ ) |
| 50 |
} |
| 51 |
|
| 52 |
python_test() { |
| 53 |
|
| 54 |
diff --git a/dev-python/scipy/scipy-1.9.9999.ebuild b/dev-python/scipy/scipy-1.9.9999.ebuild |
| 55 |
index 6396c461e4e3..b85e9495ebc9 100644 |
| 56 |
--- a/dev-python/scipy/scipy-1.9.9999.ebuild |
| 57 |
+++ b/dev-python/scipy/scipy-1.9.9999.ebuild |
| 58 |
@@ -62,6 +62,7 @@ RDEPEND=" |
| 59 |
BDEPEND=" |
| 60 |
dev-lang/swig |
| 61 |
>=dev-python/cython-0.29.18[${PYTHON_USEDEP}] |
| 62 |
+ >=dev-python/meson-python-0.11[${PYTHON_USEDEP}] |
| 63 |
dev-python/pybind11[${PYTHON_USEDEP}] |
| 64 |
>=dev-util/meson-0.62.2 |
| 65 |
dev-util/patchelf |
| 66 |
@@ -70,10 +71,6 @@ BDEPEND=" |
| 67 |
fortran? ( dev-python/pythran[${PYTHON_USEDEP}] ) |
| 68 |
test? ( dev-python/pytest-xdist[${PYTHON_USEDEP}] )" |
| 69 |
|
| 70 |
-PATCHES=( |
| 71 |
- "${FILESDIR}"/${PN}-1.9.9999-meson-options-lapack.patch |
| 72 |
-) |
| 73 |
- |
| 74 |
EPYTEST_DESELECT=( |
| 75 |
linalg/tests/test_decomp.py::TestSchur::test_sort |
| 76 |
linalg/tests/test_solvers.py::test_solve_discrete_are |
| 77 |
@@ -90,9 +87,11 @@ src_unpack() { |
| 78 |
} |
| 79 |
|
| 80 |
python_configure_all() { |
| 81 |
- # workaround stupid numpy distutils overrides, indirectly via pythran |
| 82 |
- export SETUPTOOLS_USE_DISTUTILS=stdlib |
| 83 |
export SCIPY_USE_PYTHRAN=$(usex fortran 1 0) |
| 84 |
+ DISTUTILS_ARGS=( |
| 85 |
+ -Dblas=blas |
| 86 |
+ -Dlapack=lapack |
| 87 |
+ ) |
| 88 |
} |
| 89 |
|
| 90 |
python_test() { |
Archives