Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/5] package/python-numpy: bump to version 1.25.0
@ 2023-06-26 18:15 James Hilliard
  2023-06-26 18:15 ` [Buildroot] [PATCH 2/5] package/python-pythran: bump to version 0.13.1 James Hilliard
                   ` (4 more replies)
  0 siblings, 5 replies; 13+ messages in thread
From: James Hilliard @ 2023-06-26 18:15 UTC (permalink / raw)
  To: buildroot
  Cc: Eric Le Bihan, Gustavo Heinz, Michael Rommel, Samuel Martin,
	Angelo Compagnucci, Asaf Kahlon, Guillaume William Brs,
	James Hilliard, Jagan Teki, Thomas Petazzoni, Giulio Benetti

Migrate to meson package infrastructure.

License has changed due to date update:
https://github.com/numpy/numpy/commit/c1ffdbc0c29d48ece717acb5bfbf811c935b41f6

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/python-numpy/python-numpy.hash |  6 ++---
 package/python-numpy/python-numpy.mk   | 31 ++++++++++++--------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/package/python-numpy/python-numpy.hash b/package/python-numpy/python-numpy.hash
index 9ac9280c78..6629cebbce 100644
--- a/package/python-numpy/python-numpy.hash
+++ b/package/python-numpy/python-numpy.hash
@@ -1,7 +1,7 @@
-# Copied from https://github.com/numpy/numpy/releases/tag/v1.23.5
-sha256  1b1766d6f397c18153d40015ddfc79ddb715cabadc04d2d228d4e5a8bc4ded1a  numpy-1.23.5.tar.gz
+# Copied from https://github.com/numpy/numpy/releases/tag/v1.25.0
+sha256  f1accae9a28dc3cda46a91de86acf69de0d1b5f4edd44a9b0c3ceb8036dfff19  numpy-1.25.0.tar.gz
 # License files, locally calculated
-sha256  0f88787955e7131224f53a8c3f3e859dc502408e3a539a4dcf61fb7888b5b984  LICENSE.txt
+sha256  1034d3bd61783f3b5e7ec3e7ca818f4da4135132323a0ef99f4c0edb3c7f6bd2  LICENSE.txt
 sha256  c27d0a8026bdb8876562b720ab24d1688e3827a89f6083cd6e7e8caa9584aba3  numpy/core/src/multiarray/dragon4.c
 sha256  fbc539f47d0cf83bc61378080fb873d5c14630126cacbfe754035c3926daa5ec  numpy/core/include/numpy/libdivide/LICENSE.txt
 sha256  a14cc25e10d40a3aa705b7de2fb764a6535d8ee9b2db4e1724900585457dfd55  numpy/linalg/lapack_lite/LICENSE.txt
diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk
index 812bfdae4a..ad64a0cc6b 100644
--- a/package/python-numpy/python-numpy.mk
+++ b/package/python-numpy/python-numpy.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PYTHON_NUMPY_VERSION = 1.23.5
+PYTHON_NUMPY_VERSION = 1.25.0
 PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz
 PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION)
 PYTHON_NUMPY_LICENSE = BSD-3-Clause, MIT, Zlib
@@ -15,30 +15,27 @@ PYTHON_NUMPY_LICENSE_FILES = \
 	numpy/linalg/lapack_lite/LICENSE.txt \
 	tools/npy_tempita/license.txt
 
-PYTHON_NUMPY_SETUP_TYPE = setuptools
-PYTHON_NUMPY_DEPENDENCIES = host-python-cython
+PYTHON_NUMPY_DEPENDENCIES = host-python-cython python3
 HOST_PYTHON_NUMPY_DEPENDENCIES = host-python-cython
 
+PYTHON_NUMPY_CONF_ENV += \
+	_PYTHON_SYSCONFIGDATA_NAME=$(PKG_PYTHON_SYSCONFIGDATA_NAME) \
+	PYTHONPATH=$(PYTHON3_PATH)
+
 ifeq ($(BR2_PACKAGE_LAPACK),y)
 PYTHON_NUMPY_DEPENDENCIES += lapack
+PYTHON_NUMPY_CONF_OPTS = -Dlapack=lapack
 else
-PYTHON_NUMPY_ENV += BLAS=None LAPACK=None
+PYTHON_NUMPY_CONF_OPTS = -Dlapack=""
 endif
 
-ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y)
-PYTHON_NUMPY_BUILD_OPTS = --fcompiler=gnu95
-PYTHON_NUMPY_ENV += F90=$(TARGET_FC)
+ifeq ($(BR2_PACKAGE_OPENBLAS),y)
+PYTHON_NUMPY_DEPENDENCIES += openblas
+PYTHON_NUMPY_CONF_OPTS += -Dblas=openblas
 else
-PYTHON_NUMPY_BUILD_OPTS = --fcompiler=None
+PYTHON_NUMPY_CONF_OPTS += -Dblas=""
 endif
 
-define PYTHON_NUMPY_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
-
 # Fixup the npymath.ini prefix path with actual target staging area where
 # numpy core was built. Without this, target builds using numpy distutils
 # extensions like python-scipy, python-numba cannot find -lnpymath since
@@ -55,5 +52,5 @@ PYTHON_NUMPY_POST_INSTALL_STAGING_HOOKS += PYTHON_NUMPY_FIXUP_NPY_PKG_CONFIG_FIL
 # in the staging area.
 PYTHON_NUMPY_INSTALL_STAGING = YES
 
-$(eval $(python-package))
-$(eval $(host-python-package))
+$(eval $(meson-package))
+$(eval $(host-meson-package))
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2023-09-30 12:40 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-26 18:15 [Buildroot] [PATCH 1/5] package/python-numpy: bump to version 1.25.0 James Hilliard
2023-06-26 18:15 ` [Buildroot] [PATCH 2/5] package/python-pythran: bump to version 0.13.1 James Hilliard
2023-09-30 12:38   ` Thomas Petazzoni via buildroot
2023-06-26 18:15 ` [Buildroot] [PATCH 3/5] package/python-pybind: bump to version 2.10.4 James Hilliard
2023-09-30 12:40   ` Thomas Petazzoni via buildroot
2023-06-26 18:15 ` [Buildroot] [PATCH 4/5] package/python-scipy: bump to version 1.11.0 James Hilliard
2023-09-30 12:40   ` Thomas Petazzoni via buildroot
2023-06-26 18:15 ` [Buildroot] [PATCH 5/5] package/pkg-python.mk: migrate setuptools to pep517 James Hilliard
2023-07-10 17:53   ` Thomas Petazzoni via buildroot
2023-07-10 19:55     ` James Hilliard
2023-08-26 22:11   ` Thomas Petazzoni via buildroot
2023-08-27  6:37     ` James Hilliard
2023-09-30 12:37 ` [Buildroot] [PATCH 1/5] package/python-numpy: bump to version 1.25.0 Thomas Petazzoni via buildroot

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox