diff --git a/lang/python/host-pip-requirements/Cython.txt b/lang/python/host-pip-requirements/Cython.txt index fb7a7f472..bf3e50114 100644 --- a/lang/python/host-pip-requirements/Cython.txt +++ b/lang/python/host-pip-requirements/Cython.txt @@ -1 +1 @@ -Cython==0.29.21 --hash=sha256:e57acb89bd55943c8d8bf813763d20b9099cc7165c0f16b707631a7654be9cad +Cython==0.29.23 --hash=sha256:6a0d31452f0245daacb14c979c77e093eb1a546c760816b5eed0047686baad8e diff --git a/lang/python/numpy/Makefile b/lang/python/numpy/Makefile index 6b417a775..121c87bc4 100644 --- a/lang/python/numpy/Makefile +++ b/lang/python/numpy/Makefile @@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=numpy -PKG_VERSION:=1.20.2 +PKG_VERSION:=1.21.1 PKG_RELEASE:=1 PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=878922bf5ad7550aa044aa9301d417e2d3ae50f0f577de92051d739ac6096cee +PKG_HASH:=dff4af63638afcc57a3dfb9e4b26d434a7a602d225b42d746ea7fe2edf1342fd PKG_MAINTAINER:=Alexandru Ardelean @@ -18,6 +18,9 @@ PKG_LICENSE:=BSD-3-Clause PKG_LICENSE_FILES:=LICENSE.txt PKG_CPE_ID:=cpe:/a:numpy:numpy +PKG_CONFIG_DEPENDS:= \ + CONFIG_NUMPY_OPENBLAS_SUPPORT + # yes, zip... sigh PYPI_SOURCE_EXT:=zip HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=Cython @@ -32,7 +35,39 @@ define Package/python3-numpy CATEGORY:=Languages TITLE:=The fundamental package for scientific computing with Python URL:=https://www.numpy.org/ - DEPENDS:=@!SOFT_FLOAT +INSTALL_GFORTRAN:libgfortran +python3 + DEPENDS:=@!SOFT_FLOAT +INSTALL_GFORTRAN:libgfortran +python3 \ + +NUMPY_OPENBLAS_SUPPORT:openblas +endef + +# We need to duplicate the omitted arhitectures same as openblas +define Package/python3-numpy/config +menu "Configuration" +depends on PACKAGE_python3-numpy +depends on !powerpc +depends on !arc + +config NUMPY_OPENBLAS_SUPPORT + bool "Enable OpenBLAS support" + default n + +endmenu +endef + +ifdef CONFIG_NUMPY_OPENBLAS_SUPPORT +define Build/Prepare/numpy-sitecfg + echo "[DEFAULT]" > $(PKG_BUILD_DIR)/site.cfg + echo "library_dirs = $(STAGING_DIR)/usr/lib" >> $(PKG_BUILD_DIR)/site.cfg + echo "include_dirs = $(STAGING_DIR)/usr/include" >> $(PKG_BUILD_DIR)/site.cfg + echo >> $(PKG_BUILD_DIR)/site.cfg + echo "[openblas]" >> $(PKG_BUILD_DIR)/site.cfg + echo "libraries = openblas" >> $(PKG_BUILD_DIR)/site.cfg + echo "runtime_library_dirs = /usr/lib" >> $(PKG_BUILD_DIR)/site.cfg +endef +endif + +define Build/Prepare + $(call Build/Prepare/Default) + $(call Build/Prepare/numpy-sitecfg) endef define Package/python3-numpy/description