summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-02-06 22:53:13 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-02-08 14:20:18 +0000
commit81cfa7d0e01d22a9acebcef7e23b8a4f67d2275d (patch)
treed3d124fb0f74b3bbcb6b0cb87b29349996693a0d /meta/recipes-devtools
parenta39d3f2ed7168e067d171c21a24c743bfd38466b (diff)
downloadpoky-81cfa7d0e01d22a9acebcef7e23b8a4f67d2275d.tar.gz
python3-numpy: update 1.22.1 -> 1.22.2
Replace an ad hoc fix via patch with an upstream one. (From OE-Core rev: 991f8617b9ca9680b3f81cb215e3b39095260e7c) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/python/python3-numpy/0001-numpy-core-setup.py-disable-svml-for-now.patch29
-rw-r--r--meta/recipes-devtools/python/python3-numpy_1.22.2.bb (renamed from meta/recipes-devtools/python/python3-numpy_1.22.1.bb)7
2 files changed, 5 insertions, 31 deletions
diff --git a/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-setup.py-disable-svml-for-now.patch b/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-setup.py-disable-svml-for-now.patch
deleted file mode 100644
index 66e322116a..0000000000
--- a/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-setup.py-disable-svml-for-now.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 0f0601e79f9ce7614d157284523e6cd8af2259d5 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Wed, 5 Jan 2022 12:12:47 +0100
4Subject: [PATCH] numpy/core/setup.py: disable svml for now
5
6The check really doesn't work in cross compiling,
7as it is using host python to see what arch we're
8building on. Issue reported upstream:
9https://github.com/numpy/numpy/issues/20736
10
11Upstream-Status: Inappropriate [needs upstream fix]
12Signed-off-by: Alexander Kanavin <alex@linutronix.de>
13---
14 numpy/core/setup.py | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/numpy/core/setup.py b/numpy/core/setup.py
18index a5f423d..945f2dd 100644
19--- a/numpy/core/setup.py
20+++ b/numpy/core/setup.py
21@@ -70,7 +70,7 @@ def can_link_svml():
22 """
23 machine = platform.machine()
24 system = platform.system()
25- return "x86_64" in machine and system == "Linux"
26+ return False
27
28 def check_svml_submodule(svmlpath):
29 if not os.path.exists(svmlpath + "/README.md"):
diff --git a/meta/recipes-devtools/python/python3-numpy_1.22.1.bb b/meta/recipes-devtools/python/python3-numpy_1.22.2.bb
index b79ce61fbf..ba0a777551 100644
--- a/meta/recipes-devtools/python/python3-numpy_1.22.1.bb
+++ b/meta/recipes-devtools/python/python3-numpy_1.22.2.bb
@@ -11,9 +11,8 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S
11 file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ 11 file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
12 file://0001-numpy-core-Define-RISCV-32-support.patch \ 12 file://0001-numpy-core-Define-RISCV-32-support.patch \
13 file://run-ptest \ 13 file://run-ptest \
14 file://0001-numpy-core-setup.py-disable-svml-for-now.patch \
15 " 14 "
16SRC_URI[sha256sum] = "dd1968402ae20dfd59b34acd799b494be340c774f6295e9bf1c2b9842a5e416d" 15SRC_URI[sha256sum] = "093d513a460fd94f94c16193c3ef29b2d69a33e482071e3d6d6e561a700587a6"
17 16
18UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" 17UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
19UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" 18UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
@@ -26,6 +25,10 @@ S = "${WORKDIR}/numpy-${PV}"
26 25
27CLEANBROKEN = "1" 26CLEANBROKEN = "1"
28 27
28do_compile:prepend() {
29 export NPY_DISABLE_SVML=1
30}
31
29FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a ${PYTHON_SITEPACKAGES_DIR}/numpy/random/lib/*.a" 32FILES:${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a ${PYTHON_SITEPACKAGES_DIR}/numpy/random/lib/*.a"
30 33
31# install what is needed for numpy.test() 34# install what is needed for numpy.test()