Bump python-scipy
This commit is contained in:
j1nx
parent
083ccaae5d
commit
53bae2b9e0
|
|
@ -0,0 +1,36 @@
|
|||
From aae8b63ddffe014e9353c3e8d2604628433eb7d7 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 4 Dec 2022 14:14:21 +0100
|
||||
Subject: [PATCH] build sh4 FE
|
||||
|
||||
ensures FE_UPWARD and FE_DOWNWARD are defined for sh4 architecture.
|
||||
|
||||
Closes: #1007769.
|
||||
|
||||
[Retrieved from:
|
||||
https://salsa.debian.org/python-team/packages/scipy/-/blob/master/debian/patches/build_sh4_FE.patch]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
scipy/special/_round.h | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/scipy/special/_round.h b/scipy/special/_round.h
|
||||
index 013a25620..c321a1939 100644
|
||||
--- a/scipy/special/_round.h
|
||||
+++ b/scipy/special/_round.h
|
||||
@@ -69,5 +69,12 @@ int fegetround()
|
||||
|
||||
#endif
|
||||
|
||||
+/* SH4 is not C99 compliant, see https://github.com/scipy/scipy/issues/15584 */
|
||||
+#ifndef FE_UPWARD
|
||||
+#define FE_UPWARD -1
|
||||
+#endif
|
||||
+#ifndef FE_DOWNWARD
|
||||
+#define FE_DOWNWARD -1
|
||||
+#endif
|
||||
|
||||
#endif /* _round.h */
|
||||
--
|
||||
2.38.1
|
||||
|
||||
|
|
@ -1,15 +1,12 @@
|
|||
config BR2_PACKAGE_PYTHON_SCIPY
|
||||
bool "python-scipy"
|
||||
depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS # openblas
|
||||
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS # python-numpy
|
||||
depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS # lapack
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL # python-numpy
|
||||
depends on BR2_TOOLCHAIN_HAS_FORTRAN # lapack
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_PACKAGE_PYTHON3
|
||||
select BR2_PACKAGE_LAPACK
|
||||
select BR2_PACKAGE_OPENBLAS
|
||||
select BR2_PACKAGE_ZLIB # runtime scipy::io
|
||||
select BR2_PACKAGE_PYTHON3_ZLIB # runtime scipy::io
|
||||
select BR2_PACKAGE_PYTHON_NUMPY # runtime
|
||||
select BR2_PACKAGE_PYTHON_PYBIND
|
||||
help
|
||||
|
|
@ -21,10 +18,8 @@ config BR2_PACKAGE_PYTHON_SCIPY
|
|||
https://www.scipy.org/scipylib/
|
||||
|
||||
comment "python-scipy needs toolchain w/ fortran and c++ and glibc or musl"
|
||||
depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS
|
||||
depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS
|
||||
depends on BR2_PACKAGE_LAPACK_ARCH_SUPPORTS
|
||||
depends on BR2_PACKAGE_PYTHON3
|
||||
depends on !BR2_TOOLCHAIN_HAS_FORTRAN || \
|
||||
!BR2_INSTALL_LIBSTDCPP || \
|
||||
(!BR2_TOOLCHAIN_USES_GLIBC && !BR2_TOOLCHAIN_USES_MUSL)
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
# Locally generated
|
||||
sha256 4042211bed8e6c658b9e2a4ca829806f0b33437faa7878c8dc6d6f72845b1694 scipy-1.7.3.tar.xz
|
||||
sha256 32b2f41fb8c1193a066c1686bb3237e79f918685bf545cb6dfcb68753ac35152 LICENSE.txt
|
||||
sha256 26d28c468900e6d5fdb37d2812ab46db0ccd22c63baa095057871faa3a498bc9 scipy-1.9.1.tar.gz
|
||||
sha256 96599f8ec69a2cc609265eed13fc75090aacb28742260e55ce623788a33da19c LICENSE.txt
|
||||
sha256 37e64a498894ac7c3b070023e3689e954a8ecf8a23b90968d09a455f1b4f7b35 scipy/linalg/src/lapack_deprecations/LICENSE
|
||||
sha256 606209a000716c5f66e33e180ce08434b96ed17db4975ab9723c6b5fbcc89609 scipy/ndimage/LICENSE.txt
|
||||
sha256 3df9207af2fdb861af0ae3b22026f163b9bcfab4e525dc4943afe2ffa3f77624 scipy/optimize/tnc/LICENSE
|
||||
sha256 f0cedf52503b2d42b83411a0a16e6fefac346dfad8fddc66f50050150123470c scipy/sparse/linalg/dsolve/SuperLU/License.txt
|
||||
sha256 0926566f9f406178d1214f8cc796e166b1213dd7c05e0c5b461a8b8ac9e50bbe scipy/sparse/linalg/eigen/arpack/ARPACK/COPYING
|
||||
sha256 f0cedf52503b2d42b83411a0a16e6fefac346dfad8fddc66f50050150123470c scipy/sparse/linalg/_dsolve/SuperLU/License.txt
|
||||
sha256 0926566f9f406178d1214f8cc796e166b1213dd7c05e0c5b461a8b8ac9e50bbe scipy/sparse/linalg/_eigen/arpack/ARPACK/COPYING
|
||||
sha256 34db0c0c4f931861d720555c9cd7a2e228d1290ba29af0f2ee80c41bb2038afb scipy/spatial/qhull_src/COPYING.txt
|
||||
|
|
|
|||
|
|
@ -4,31 +4,31 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_SCIPY_VERSION = 1.7.3
|
||||
PYTHON_SCIPY_SOURCE = scipy-$(PYTHON_SCIPY_VERSION).tar.xz
|
||||
PYTHON_SCIPY_VERSION = 1.9.1
|
||||
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, \
|
||||
BSD-2-Clause, \
|
||||
BSD, \
|
||||
BSD-Style, \
|
||||
Apache-2.0, \
|
||||
MIT
|
||||
MIT, \
|
||||
Qhull
|
||||
PYTHON_SCIPY_LICENSE_FILES = \
|
||||
LICENSE.txt \
|
||||
scipy/linalg/src/lapack_deprecations/LICENSE \
|
||||
scipy/ndimage/LICENSE.txt \
|
||||
scipy/optimize/tnc/LICENSE \
|
||||
scipy/sparse/linalg/dsolve/SuperLU/License.txt \
|
||||
scipy/sparse/linalg/eigen/arpack/ARPACK/COPYING \
|
||||
scipy/sparse/linalg/_dsolve/SuperLU/License.txt \
|
||||
scipy/sparse/linalg/_eigen/arpack/ARPACK/COPYING \
|
||||
scipy/spatial/qhull_src/COPYING.txt
|
||||
PYTHON_SCIPY_CPE_ID_VENDOR = scipy
|
||||
PYTHON_SCIPY_CPE_ID_PRODUCT = scipy
|
||||
PYTHON_SCIPY_DEPENDENCIES += \
|
||||
host-meson \
|
||||
host-python-numpy \
|
||||
host-python-pythran \
|
||||
zlib \
|
||||
lapack \
|
||||
openblas \
|
||||
python-numpy \
|
||||
python-pybind
|
||||
PYTHON_SCIPY_INSTALL_STAGING = YES
|
||||
|
|
@ -36,22 +36,26 @@ PYTHON_SCIPY_INSTALL_STAGING = YES
|
|||
PYTHON_SCIPY_SETUP_TYPE = setuptools
|
||||
PYTHON_SCIPY_BUILD_OPTS = config_fc --fcompiler=gnu95
|
||||
|
||||
# -lnpymath npymath.ini localization
|
||||
PYTHON_SCIPY_NPY_PKG_CONFIG_PATH = \
|
||||
$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/lib/npy-pkg-config
|
||||
|
||||
PYTHON_SCIPY_CFLAGS = \
|
||||
-I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)
|
||||
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
|
||||
|
||||
# scipy can use C++11 atomics when available, so we need to link with
|
||||
# libatomic for the architectures that need libatomic.
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
PYTHON_SCIPY_LDFLAGS += -latomic
|
||||
endif
|
||||
|
||||
PYTHON_SCIPY_ENV = \
|
||||
F90=$(TARGET_FC) \
|
||||
NPY_PKG_CONFIG_PATH=$(PYTHON_SCIPY_NPY_PKG_CONFIG_PATH) \
|
||||
CFLAGS="$(PYTHON_SCIPY_CFLAGS)" \
|
||||
LDFLAGS="$(PYTHON_SCIPY_LDFLAGS)"
|
||||
|
||||
# Provide system configuration options to numpy distutils extenions, telling
|
||||
# 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
|
||||
|
|
|
|||
Loading…
Reference in New Issue