mirror of
https://git.openwrt.org/feed/packages.git
synced 2024-06-20 15:48:40 +02:00
Merge pull request #20978 from jefferyto/numpy-build-fixes
numpy: Build fixes
This commit is contained in:
commit
9fb783712c
|
@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=numpy
|
PKG_NAME:=numpy
|
||||||
PKG_VERSION:=1.23.3
|
PKG_VERSION:=1.23.3
|
||||||
PKG_RELEASE:=2
|
PKG_RELEASE:=5
|
||||||
|
|
||||||
PYPI_NAME:=$(PKG_NAME)
|
PYPI_NAME:=$(PKG_NAME)
|
||||||
PKG_HASH:=51bf49c0cd1d52be0a240aa66f3458afc4b95d8993d2d04f0d91fa60c10af6cd
|
PKG_HASH:=51bf49c0cd1d52be0a240aa66f3458afc4b95d8993d2d04f0d91fa60c10af6cd
|
||||||
|
@ -23,6 +23,10 @@ PKG_CONFIG_DEPENDS:= \
|
||||||
|
|
||||||
PKG_BUILD_DEPENDS:=python-cython/host
|
PKG_BUILD_DEPENDS:=python-cython/host
|
||||||
|
|
||||||
|
# Ensure numpy does not find openblas if openblas support is not enabled
|
||||||
|
PYTHON3_PKG_BUILD_VARS:= \
|
||||||
|
$(if $(CONFIG_NUMPY_OPENBLAS_SUPPORT),,NPY_BLAS_ORDER= NPY_LAPACK_ORDER= )
|
||||||
|
|
||||||
include ../pypi.mk
|
include ../pypi.mk
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
include ../python3-package.mk
|
include ../python3-package.mk
|
||||||
|
@ -50,17 +54,18 @@ config NUMPY_OPENBLAS_SUPPORT
|
||||||
endmenu
|
endmenu
|
||||||
endef
|
endef
|
||||||
|
|
||||||
ifdef CONFIG_NUMPY_OPENBLAS_SUPPORT
|
|
||||||
define Build/Prepare/numpy-sitecfg
|
define Build/Prepare/numpy-sitecfg
|
||||||
echo "[DEFAULT]" > $(PKG_BUILD_DIR)/site.cfg
|
echo "[DEFAULT]" > $(PKG_BUILD_DIR)/site.cfg
|
||||||
echo "library_dirs = $(STAGING_DIR)/usr/lib" >> $(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 "include_dirs = $(STAGING_DIR)/usr/include" >> $(PKG_BUILD_DIR)/site.cfg
|
||||||
|
|
||||||
|
ifdef CONFIG_NUMPY_OPENBLAS_SUPPORT
|
||||||
echo >> $(PKG_BUILD_DIR)/site.cfg
|
echo >> $(PKG_BUILD_DIR)/site.cfg
|
||||||
echo "[openblas]" >> $(PKG_BUILD_DIR)/site.cfg
|
echo "[openblas]" >> $(PKG_BUILD_DIR)/site.cfg
|
||||||
echo "libraries = 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
|
echo "runtime_library_dirs = /usr/lib" >> $(PKG_BUILD_DIR)/site.cfg
|
||||||
|
endif
|
||||||
endef
|
endef
|
||||||
endif
|
|
||||||
|
|
||||||
define Build/Prepare
|
define Build/Prepare
|
||||||
$(call Build/Prepare/Default)
|
$(call Build/Prepare/Default)
|
||||||
|
|
13
lang/python/numpy/patches/001-unpin-build-dependencies.patch
Normal file
13
lang/python/numpy/patches/001-unpin-build-dependencies.patch
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
--- a/pyproject.toml
|
||||||
|
+++ b/pyproject.toml
|
||||||
|
@@ -2,8 +2,8 @@
|
||||||
|
# Minimum requirements for the build system to execute.
|
||||||
|
requires = [
|
||||||
|
"packaging==20.5; platform_machine=='arm64'", # macos M1
|
||||||
|
- "setuptools==59.2.0",
|
||||||
|
- "wheel==0.37.0",
|
||||||
|
+ "setuptools>=59.2.0",
|
||||||
|
+ "wheel>=0.37.0",
|
||||||
|
"Cython>=0.29.30,<3.0",
|
||||||
|
]
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- a/numpy/distutils/system_info.py
|
||||||
|
+++ b/numpy/distutils/system_info.py
|
||||||
|
@@ -400,7 +400,7 @@ def get_standard_file(fname):
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
user_file = os.path.join(f, fname)
|
||||||
|
- if os.path.isfile(user_file):
|
||||||
|
+ if "_PYTHON_HOST_PLATFORM" not in os.environ and os.path.isfile(user_file):
|
||||||
|
filenames.append(user_file)
|
||||||
|
|
||||||
|
# Local file
|
Loading…
Reference in New Issue
Block a user