On Sun, Nov 15, 2020 at 3:42 PM Khem Raj <[email protected]> wrote: > > Signed-off-by: Khem Raj <[email protected]>
Reviewed-by: Alistair Francis <[email protected]> Alistair > --- > ...1-numpy-core-Define-RISCV-32-support.patch | 35 +++++++++++++++++++ > .../python-numpy/python-numpy.inc | 1 + > 2 files changed, 36 insertions(+) > create mode 100644 > meta/recipes-devtools/python-numpy/files/0001-numpy-core-Define-RISCV-32-support.patch > > diff --git > a/meta/recipes-devtools/python-numpy/files/0001-numpy-core-Define-RISCV-32-support.patch > > b/meta/recipes-devtools/python-numpy/files/0001-numpy-core-Define-RISCV-32-support.patch > new file mode 100644 > index 0000000000..b7a9e42b30 > --- /dev/null > +++ > b/meta/recipes-devtools/python-numpy/files/0001-numpy-core-Define-RISCV-32-support.patch > @@ -0,0 +1,35 @@ > +From fff0371f043177b4a23998241beaaa2a3413106a Mon Sep 17 00:00:00 2001 > +From: Khem Raj <[email protected]> > +Date: Sun, 15 Nov 2020 15:32:39 -0800 > +Subject: [PATCH] numpy/core: Define RISCV-32 support > + > +Helps compile on riscv32 > + > +Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/17780] > +Signed-off-by: Khem Raj <[email protected]> > +--- > + numpy/core/include/numpy/npy_cpu.h | 8 ++++++-- > + 1 file changed, 6 insertions(+), 2 deletions(-) > + > +diff --git a/numpy/core/include/numpy/npy_cpu.h > b/numpy/core/include/numpy/npy_cpu.h > +index 4dbf9d84e..045e84d63 100644 > +--- a/numpy/core/include/numpy/npy_cpu.h > ++++ b/numpy/core/include/numpy/npy_cpu.h > +@@ -100,8 +100,12 @@ > + #define NPY_CPU_ARCEL > + #elif defined(__arc__) && defined(__BIG_ENDIAN__) > + #define NPY_CPU_ARCEB > +-#elif defined(__riscv) && defined(__riscv_xlen) && __riscv_xlen == 64 > +- #define NPY_CPU_RISCV64 > ++#elif defined(__riscv) > ++ #if __riscv_xlen == 64 > ++ #define NPY_CPU_RISCV64 > ++ #elif __riscv_xlen == 32 > ++ #define NPY_CPU_RISCV32 > ++ #endif > + #elif defined(__EMSCRIPTEN__) > + /* __EMSCRIPTEN__ is defined by emscripten: an LLVM-to-Web compiler */ > + #define NPY_CPU_WASM > +-- > +2.29.2 > + > diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc > b/meta/recipes-devtools/python-numpy/python-numpy.inc > index b1058b26c8..40f81046ee 100644 > --- a/meta/recipes-devtools/python-numpy/python-numpy.inc > +++ b/meta/recipes-devtools/python-numpy/python-numpy.inc > @@ -7,6 +7,7 @@ SRCNAME = "numpy" > > SRC_URI = > "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz > \ > > file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ > + file://0001-numpy-core-Define-RISCV-32-support.patch \ > " > SRC_URI[sha256sum] = > "9179d259a9bc53ed7b153d31fc3156d1ca560d61079f53191cf177c3efc4a498" > > -- > 2.29.2 > > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#144622): https://lists.openembedded.org/g/openembedded-core/message/144622 Mute This Topic: https://lists.openembedded.org/mt/78281759/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
