@@ -1,5 +1,5 @@
# Locally generated
-sha256 0140dd24d14ce194fdb3df496c2190f0896ca84ac98bf5d69c3b3fb7bde1a1e9 scipy-1.8.1.tar.xz
+sha256 c0dfd7d2429452e7e94904c6a3af63cbaa3cf51b348bd9d35b42db7e9ad42791 scipy-1.9.0.tar.gz
sha256 96599f8ec69a2cc609265eed13fc75090aacb28742260e55ce623788a33da19c LICENSE.txt
sha256 37e64a498894ac7c3b070023e3689e954a8ecf8a23b90968d09a455f1b4f7b35 scipy/linalg/src/lapack_deprecations/LICENSE
sha256 606209a000716c5f66e33e180ce08434b96ed17db4975ab9723c6b5fbcc89609 scipy/ndimage/LICENSE.txt
@@ -4,8 +4,8 @@
#
################################################################################
-PYTHON_SCIPY_VERSION = 1.8.1
-PYTHON_SCIPY_SOURCE = scipy-$(PYTHON_SCIPY_VERSION).tar.xz
+PYTHON_SCIPY_VERSION = 1.9.0
+PYTHON_SCIPY_SOURCE = scipy-$(PYTHON_SCIPY_VERSION).tar.gz
PYTHON_SCIPY_SITE = https://github.com/scipy/scipy/releases/download/v$(PYTHON_SCIPY_VERSION)
PYTHON_SCIPY_LICENSE = \
BSD-3-Clause, \
@@ -23,6 +23,7 @@ PYTHON_SCIPY_LICENSE_FILES = \
scipy/sparse/linalg/_eigen/arpack/ARPACK/COPYING \
scipy/spatial/qhull_src/COPYING.txt
PYTHON_SCIPY_DEPENDENCIES += \
+ host-pkgconf \
host-python-numpy \
host-python-pythran \
zlib \
@@ -31,26 +32,15 @@ PYTHON_SCIPY_DEPENDENCIES += \
python-pybind
PYTHON_SCIPY_INSTALL_STAGING = YES
-PYTHON_SCIPY_SETUP_TYPE = setuptools
-PYTHON_SCIPY_BUILD_OPTS = config_fc --fcompiler=gnu95
+#PYTHON_SCIPY_LDFLAGS = $(TARGET_LDFLAGS) -shared \
+# -L$(PYTHON3_PATH)/site-packages/numpy/core/lib
-PYTHON_SCIPY_LDFLAGS = $(TARGET_LDFLAGS) -shared \
- -L$(PYTHON3_PATH)/site-packages/numpy/core/lib
-# -lnpyrandom localization
-PYTHON_SCIPY_LDFLAGS += \
- -L$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/random/lib
+#PYTHON_SCIPY_CONF_ENV += \
+# PYTHONPATH=$(PYTHON3_PATH) \
+# LDFLAGS="$(PYTHON_SCIPY_LDFLAGS)"
-PYTHON_SCIPY_ENV = \
- F90=$(TARGET_FC) \
- LDFLAGS="$(PYTHON_SCIPY_LDFLAGS)"
+PYTHON_SCIPY_CONF_OPTS = \
+ -Dblas=lapack \
+ -Dlapack=lapack
-# Provide system configuration options to numpy distutils extensions, telling
-# to find all include files and libraries in staging directory.
-define PYTHON_SCIPY_CONFIGURE_CMDS
- -rm -f $(@D)/site.cfg
- echo "[DEFAULT]" >> $(@D)/site.cfg
- echo "library_dirs = $(STAGING_DIR)/usr/lib" >> $(@D)/site.cfg
- echo "include_dirs = $(STAGING_DIR)/usr/include" >> $(@D)/site.cfg
-endef
-
-$(eval $(python-package))
+$(eval $(meson-package))
python-scipy is moving to a meson build infrastructure. Signed-off-by: Guillaume W. Bres <guillaume.bressaix@gmail.com> --- thank you guys for the valuable help already, this is significant progress and we're almost there. Here's a V2 for those willing to test, I dediced to make it available although i'm just starting investigating. It terminates in a -lnpymath cross/host mix up "file format not recognized", that I've had with previous scipy versions (distutils). I think I solved it with some LDFLAGS, but I need to search my notes. v1 -> v2 - patch pkg/meson to become knowledgeable of "fortran" compiler - keep using tarball like before (but .tar.xz was not released this time) - correct blas = lapack definition - investigating new error --- package/python-scipy/python-scipy.hash | 2 +- package/python-scipy/python-scipy.mk | 34 +++++++++----------------- 2 files changed, 13 insertions(+), 23 deletions(-)