summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python/python3-numpy
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2024-12-17 11:52:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-12-17 11:53:15 +0000
commite16e725fb51fd612814c41a122f77af7e62833d8 (patch)
tree79b1414b045e4334ff521f6ae8d4082abd68ebdb /meta/recipes-devtools/python/python3-numpy
parent5cb3d1a59cb423cc672720f797236578cac19628 (diff)
downloadpoky-e16e725fb51fd612814c41a122f77af7e62833d8.tar.gz
Revert "python3-numpy: upgrade 2.1.3 -> 2.2.0"
This reverts commit ff93068be3dd1993675dd016fd6b5e98ccb262bf. Sadly this upgrade does pass reproducible build tests: http://valkyrie.yocto.io/pub/repro-fail/oe-reproducible-20241217-q6urkm0e/packages/diff-html/ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python/python3-numpy')
-rw-r--r--meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch58
1 files changed, 58 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch b/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch
new file mode 100644
index 0000000000..6da9047ec5
--- /dev/null
+++ b/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch
@@ -0,0 +1,58 @@
1From 0e2b652a0eff85798584116c905a2d6ad8f25d5f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 15 Nov 2020 15:32:39 -0800
4Subject: [PATCH] numpy/core: Define RISCV-32 support
5
6Helps compile on riscv32
7
8Upstream-Status: Backport
9(https://github.com/numpy/numpy/pull/17780/commits/0e2b652a0eff85798584116c905a2d6ad8f25d5f)
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 numpy/_core/include/numpy/npy_cpu.h | 9 +++++++--
14 numpy/_core/include/numpy/npy_endian.h | 1 +
15 2 files changed, 8 insertions(+), 2 deletions(-)
16
17diff --git a/numpy/_core/include/numpy/npy_cpu.h b/numpy/_core/include/numpy/npy_cpu.h
18index a19f8e6bbd..15f9f12931 100644
19--- a/numpy/_core/include/numpy/npy_cpu.h
20+++ b/numpy/_core/include/numpy/npy_cpu.h
21@@ -18,6 +18,7 @@
22 * NPY_CPU_ARCEL
23 * NPY_CPU_ARCEB
24 * NPY_CPU_RISCV64
25+ * NPY_CPU_RISCV32
26 * NPY_CPU_LOONGARCH
27 * NPY_CPU_WASM
28 */
29@@ -102,8 +103,12 @@
30 #define NPY_CPU_ARCEL
31 #elif defined(__arc__) && defined(__BIG_ENDIAN__)
32 #define NPY_CPU_ARCEB
33-#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64
34- #define NPY_CPU_RISCV64
35+#elif defined(__riscv)
36+ #if __riscv_xlen == 64
37+ #define NPY_CPU_RISCV64
38+ #elif __riscv_xlen == 32
39+ #define NPY_CPU_RISCV32
40+ #endif
41 #elif defined(__loongarch__)
42 #define NPY_CPU_LOONGARCH
43 #elif defined(__EMSCRIPTEN__)
44diff --git a/numpy/_core/include/numpy/npy_endian.h b/numpy/_core/include/numpy/npy_endian.h
45index 5e58a7f52c..09262120bf 100644
46--- a/numpy/_core/include/numpy/npy_endian.h
47+++ b/numpy/_core/include/numpy/npy_endian.h
48@@ -49,6 +49,7 @@
49 || defined(NPY_CPU_PPC64LE) \
50 || defined(NPY_CPU_ARCEL) \
51 || defined(NPY_CPU_RISCV64) \
52+ || defined(NPY_CPU_RISCV32) \
53 || defined(NPY_CPU_LOONGARCH) \
54 || defined(NPY_CPU_WASM)
55 #define NPY_BYTE_ORDER NPY_LITTLE_ENDIAN
56--
572.39.5
58