summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch58
-rw-r--r--meta/recipes-devtools/python/python3-numpy_2.2.0.bb (renamed from meta/recipes-devtools/python/python3-numpy_2.1.3.bb)3
2 files changed, 1 insertions, 60 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
deleted file mode 100644
index 6da9047ec5..0000000000
--- a/meta/recipes-devtools/python/python3-numpy/0001-numpy-core-Define-RISCV-32-support.patch
+++ /dev/null
@@ -1,58 +0,0 @@
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
diff --git a/meta/recipes-devtools/python/python3-numpy_2.1.3.bb b/meta/recipes-devtools/python/python3-numpy_2.2.0.bb
index 0120bee439..522f9682a5 100644
--- a/meta/recipes-devtools/python/python3-numpy_2.1.3.bb
+++ b/meta/recipes-devtools/python/python3-numpy_2.2.0.bb
@@ -9,11 +9,10 @@ SRCNAME = "numpy"
9 9
10SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ 10SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${SRCNAME}-${PV}.tar.gz \
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 \
13 file://fix_reproducibility.patch \ 12 file://fix_reproducibility.patch \
14 file://run-ptest \ 13 file://run-ptest \
15 " 14 "
16SRC_URI[sha256sum] = "aa08e04e08aaf974d4458def539dece0d28146d866a39da5639596f4921fd761" 15SRC_URI[sha256sum] = "140dd80ff8981a583a60980be1a655068f8adebf7a45a06a6858c873fcdcd4a0"
17 16
18GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases" 17GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases"
19UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" 18UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$"