summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python-numpy
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-12-02 18:09:17 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-12-04 12:30:58 +0000
commit4b5dc5b4f553eacc4af096cb7eee88583b0bae6b (patch)
treeea7588ad8659d6e1230122b50ec12e0a80319fd8 /meta/recipes-devtools/python-numpy
parent030c2b8df0410a911fabbedd5e617f9a97bb62b6 (diff)
downloadpoky-4b5dc5b4f553eacc4af096cb7eee88583b0bae6b.tar.gz
python-numpy: upgrade to 1.17.4
(From OE-Core rev: 33d9d696f3a865a51c0a16a0a65a8028642be4d7) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/python-numpy')
-rw-r--r--meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch24
-rw-r--r--meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch4
-rw-r--r--meta/recipes-devtools/python-numpy/python-numpy.inc5
-rw-r--r--meta/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb (renamed from meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb)0
4 files changed, 4 insertions, 29 deletions
diff --git a/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch b/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch
deleted file mode 100644
index 4decfe66ee..0000000000
--- a/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From 629891f67601275c9c4de0bb01afcf1a8c44fa3f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 16 Mar 2018 19:55:21 -0700
4Subject: [PATCH] npy_cpu: Add riscv support
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/10761]
8---
9 numpy/core/include/numpy/npy_cpu.h | 2 ++
10 1 file changed, 2 insertions(+)
11
12diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h
13index 5edd8f4..e1e4796 100644
14--- a/numpy/core/include/numpy/npy_cpu.h
15+++ b/numpy/core/include/numpy/npy_cpu.h
16@@ -96,6 +96,8 @@
17 #define NPY_CPU_OR1K
18 #elif defined(__mc68000__)
19 #define NPY_CPU_M68K
20+#elif defined(__riscv)
21+ #define NPY_CPU_RISCV
22 #elif defined(__arc__) && defined(__LITTLE_ENDIAN__)
23 #define NPY_CPU_ARCEL
24 #elif defined(__arc__) && defined(__BIG_ENDIAN__)
diff --git a/meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch b/meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch
index ebb2a6f9df..9da6a2b3da 100644
--- a/meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch
+++ b/meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch
@@ -22,8 +22,8 @@ index a1bf3b8..60fb534 100644
22 elif not is_msvc: 22 elif not is_msvc:
23 # Some bit generators require c99 23 # Some bit generators require c99
24 EXTRA_COMPILE_ARGS += ['-std=c99'] 24 EXTRA_COMPILE_ARGS += ['-std=c99']
25- INTEL_LIKE = any([val in k.lower() for k in platform.uname() 25- INTEL_LIKE = any(arch in platform.machine()
26- for val in ('x86', 'i686', 'i386', 'amd64')]) 26- for arch in ('x86', 'i686', 'i386', 'amd64'))
27- if INTEL_LIKE: 27- if INTEL_LIKE:
28- # Assumes GCC or GCC-like compiler 28- # Assumes GCC or GCC-like compiler
29- EXTRA_COMPILE_ARGS += ['-msse2'] 29- EXTRA_COMPILE_ARGS += ['-msse2']
diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc b/meta/recipes-devtools/python-numpy/python-numpy.inc
index f68b90e6b9..8413434af9 100644
--- a/meta/recipes-devtools/python-numpy/python-numpy.inc
+++ b/meta/recipes-devtools/python-numpy/python-numpy.inc
@@ -7,11 +7,10 @@ SRCNAME = "numpy"
7 7
8SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ 8SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \
9 file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ 9 file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
10 file://0001-npy_cpu-Add-riscv-support.patch \
11 file://0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch \ 10 file://0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch \
12 " 11 "
13SRC_URI[md5sum] = "c48b2ad785f82cdfe28c907ce35e2a71" 12SRC_URI[md5sum] = "9147c3ee75e58d657b5b8b5a4f3564e0"
14SRC_URI[sha256sum] = "47b7b6145e7ba5918ce26be25999b6d4b35cf9fbfdf46b7da50090ffdb020445" 13SRC_URI[sha256sum] = "fb0415475e673cb9a6dd816df999e0ab9f86fa3af2b1770944e7288d2bea4ac9"
15 14
16UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" 15UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
17UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" 16UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb
index d388e88d25..d388e88d25 100644
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb