diff options
| author | Alexandru Ardelean <ardeleanalex@gmail.com> | 2022-10-30 19:31:26 +0200 |
|---|---|---|
| committer | Josef Schlehofer <pepe.schlehofer@gmail.com> | 2023-11-23 15:04:05 +0100 |
| commit | 593f5c2afc5b55adab92097c85332b37771d8d96 (patch) | |
| tree | 00d5054f09b6a06f7b0b92d364b7cca2e6567104 | |
| parent | 8282c0f846a1c3343df3a630e2c403ac244a932d (diff) | |
numpy: bump version to 1.24.3
Need to also fix build for GCC 13 + musl.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit 8f176e30f3dae121e374be4ca7f641cc157ea152)
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
| -rw-r--r-- | lang/python/numpy/Makefile | 12 | ||||
| -rw-r--r-- | lang/python/numpy/patches/001-unpin-build-dependencies.patch | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/lang/python/numpy/Makefile b/lang/python/numpy/Makefile index d7e485d79..bb5b898d1 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.23.3 -PKG_RELEASE:=5 +PKG_VERSION:=1.24.3 +PKG_RELEASE:=1 PYPI_NAME:=$(PKG_NAME) -PKG_HASH:=51bf49c0cd1d52be0a240aa66f3458afc4b95d8993d2d04f0d91fa60c10af6cd +PKG_HASH:=ab344f1bf21f140adab8e47fdbc7c35a477dc01408791f8ba00d018dd0bc5155 PKG_MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com> @@ -54,6 +54,12 @@ config NUMPY_OPENBLAS_SUPPORT endmenu endef +ifeq ($(ARCH),x86_64) +# FIXME: temporary fix for x86_64 with GCC 13 + musl; +# numpy does not detect this compiler extension, so we just enable it +TARGET_CFLAGS += -mavx512f +endif + define Build/Prepare/numpy-sitecfg echo "[DEFAULT]" > $(PKG_BUILD_DIR)/site.cfg echo "library_dirs = $(STAGING_DIR)/usr/lib" >> $(PKG_BUILD_DIR)/site.cfg diff --git a/lang/python/numpy/patches/001-unpin-build-dependencies.patch b/lang/python/numpy/patches/001-unpin-build-dependencies.patch index c167f0729..1606762b0 100644 --- a/lang/python/numpy/patches/001-unpin-build-dependencies.patch +++ b/lang/python/numpy/patches/001-unpin-build-dependencies.patch @@ -1,9 +1,9 @@ --- a/pyproject.toml +++ b/pyproject.toml -@@ -2,8 +2,8 @@ +@@ -1,8 +1,8 @@ + [build-system] # 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", |