summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/python-numpy
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-04-15 12:54:57 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-16 11:10:02 +0100
commit78779d4a38297120233183bf33f6659301173f74 (patch)
tree9929a92b454bf99654ff74b8ccd37c384636d764 /meta/recipes-devtools/python-numpy
parent77e39cf412ea7f7d7dacf724247d5688e05ddc12 (diff)
downloadpoky-78779d4a38297120233183bf33f6659301173f74.tar.gz
python-numpy: update to 1.16.2
Drop files/fix_shebang_f2py.patch as the code has been removed upstream. License-update: copyright years, file paths. (From OE-Core rev: 90e271e9f1c1ecdb205bca3c9b4976a1a16e83b1) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.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-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch16
-rw-r--r--meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch14
-rw-r--r--meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch29
-rw-r--r--meta/recipes-devtools/python-numpy/python-numpy.inc10
-rw-r--r--meta/recipes-devtools/python-numpy/python-numpy_1.16.2.bb (renamed from meta/recipes-devtools/python-numpy/python-numpy_1.14.5.bb)0
-rw-r--r--meta/recipes-devtools/python-numpy/python3-numpy_1.16.2.bb (renamed from meta/recipes-devtools/python-numpy/python3-numpy_1.14.5.bb)1
6 files changed, 18 insertions, 52 deletions
diff --git a/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch b/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
index 516ccd7b9b..8fe0d1a27e 100644
--- a/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
+++ b/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
@@ -1,7 +1,8 @@
1From c8c6649b29a08f82e1d6761a6d62ce5f632313c5 Mon Sep 17 00:00:00 2001 1From c14554c7e2fff8dd559dfb41e7dd11392c6f85e3 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 10 Dec 2015 13:20:30 +0200 3Date: Thu, 10 Dec 2015 13:20:30 +0200
4Subject: [PATCH 1/3] Don't search /usr and so on for libraries by default to 4Subject: [PATCH] Don't search /usr and so on for libraries by default to
5
5 avoid host contamination. 6 avoid host contamination.
6 7
7Upstream-Status: Inappropriate (As the code stands, this is a hack) 8Upstream-Status: Inappropriate (As the code stands, this is a hack)
@@ -9,16 +10,16 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10 11
11--- 12---
12 numpy/distutils/system_info.py | 50 +++++------------------------------------- 13 numpy/distutils/system_info.py | 50 ++++------------------------------
13 1 file changed, 6 insertions(+), 44 deletions(-) 14 1 file changed, 6 insertions(+), 44 deletions(-)
14 15
15diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py 16diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
16index bea120c..544e056 100644 17index 2424943..bf56a6d 100644
17--- a/numpy/distutils/system_info.py 18--- a/numpy/distutils/system_info.py
18+++ b/numpy/distutils/system_info.py 19+++ b/numpy/distutils/system_info.py
19@@ -262,51 +262,13 @@ if sys.platform == 'win32': 20@@ -274,51 +274,13 @@ if sys.platform == 'win32':
20 add_system_root(os.path.join(conda_dir, 'Library')) 21 add_system_root(os.path.join(conda_dir, 'Library'))
21 22
22 else: 23 else:
23- default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib', 24- default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib',
24- '/opt/local/lib', '/sw/lib'], platform_bits) 25- '/opt/local/lib', '/sw/lib'], platform_bits)
@@ -74,6 +75,3 @@ index bea120c..544e056 100644
74 75
75 if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: 76 if os.path.join(sys.prefix, 'lib') not in default_lib_dirs:
76 default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) 77 default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib'))
77--
782.16.1
79
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
index 4f5c4f5f0d..4decfe66ee 100644
--- 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
@@ -1,21 +1,20 @@
1From 30fb1bf9244bb0789c02ec7c98a923acc7200206 Mon Sep 17 00:00:00 2001 1From 629891f67601275c9c4de0bb01afcf1a8c44fa3f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 16 Mar 2018 19:55:21 -0700 3Date: Fri, 16 Mar 2018 19:55:21 -0700
4Subject: [PATCH] npy_cpu: Add riscv support 4Subject: [PATCH] npy_cpu: Add riscv support
5 5
6Signed-off-by: Khem Raj <raj.khem@gmail.com> 6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/10761] 7Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/10761]
9 8---
10 numpy/core/include/numpy/npy_cpu.h | 2 ++ 9 numpy/core/include/numpy/npy_cpu.h | 2 ++
11 1 file changed, 2 insertions(+) 10 1 file changed, 2 insertions(+)
12 11
13diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h 12diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h
14index 84653ea18..9e88db873 100644 13index 5edd8f4..e1e4796 100644
15--- a/numpy/core/include/numpy/npy_cpu.h 14--- a/numpy/core/include/numpy/npy_cpu.h
16+++ b/numpy/core/include/numpy/npy_cpu.h 15+++ b/numpy/core/include/numpy/npy_cpu.h
17@@ -78,6 +78,8 @@ 16@@ -96,6 +96,8 @@
18 #define NPY_CPU_AARCH64 17 #define NPY_CPU_OR1K
19 #elif defined(__mc68000__) 18 #elif defined(__mc68000__)
20 #define NPY_CPU_M68K 19 #define NPY_CPU_M68K
21+#elif defined(__riscv) 20+#elif defined(__riscv)
@@ -23,6 +22,3 @@ index 84653ea18..9e88db873 100644
23 #elif defined(__arc__) && defined(__LITTLE_ENDIAN__) 22 #elif defined(__arc__) && defined(__LITTLE_ENDIAN__)
24 #define NPY_CPU_ARCEL 23 #define NPY_CPU_ARCEL
25 #elif defined(__arc__) && defined(__BIG_ENDIAN__) 24 #elif defined(__arc__) && defined(__BIG_ENDIAN__)
26--
272.16.2
28
diff --git a/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch b/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch
deleted file mode 100644
index 8be6e4d21f..0000000000
--- a/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3Avoids using python from the HOSTs native sysroot for f2py,
4uses TARGET env python instead.
5
6Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
7
8Index: numpy-1.11.0/numpy/f2py/setup.py
9===================================================================
10--- numpy-1.11.0.orig/numpy/f2py/setup.py
11+++ numpy-1.11.0/numpy/f2py/setup.py
12@@ -37,10 +37,13 @@ def _get_f2py_shebang():
13 should be ``#!python`` rather than ``#!`` followed by the contents of
14 ``sys.executable``.
15 """
16- if set(('bdist_wheel', 'bdist_egg', 'bdist_wininst',
17- 'bdist_rpm')).intersection(sys.argv):
18- return '#!python'
19- return '#!' + sys.executable
20+ #if set(('bdist_wheel', 'bdist_egg', 'bdist_wininst',
21+ # 'bdist_rpm')).intersection(sys.argv):
22+ # return '#!python'
23+ #return '#!' + sys.executable
24+
25+ # On OE, we need to avoid using the HOSTs python-native, we return env python instead
26+ return '#!/usr/bin/env python'
27
28
29 def configuration(parent_package='', top_path=None):
diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc b/meta/recipes-devtools/python-numpy/python-numpy.inc
index 1b51f7baaf..43c8960a18 100644
--- a/meta/recipes-devtools/python-numpy/python-numpy.inc
+++ b/meta/recipes-devtools/python-numpy/python-numpy.inc
@@ -1,17 +1,17 @@
1SUMMARY = "A sophisticated Numeric Processing Package for Python" 1SUMMARY = "A sophisticated Numeric Processing Package for Python"
2SECTION = "devel/python" 2SECTION = "devel/python"
3LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD" 3LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fc53b33304171d132128ebe82ea4a645" 4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231"
5 5
6SRCNAME = "numpy" 6SRCNAME = "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://fix_shebang_f2py.patch \
11 file://0001-npy_cpu-Add-riscv-support.patch \ 10 file://0001-npy_cpu-Add-riscv-support.patch \
12 ${CONFIGFILESURI} " 11 ${CONFIGFILESURI} \
13SRC_URI[md5sum] = "e3189ee851c3a0e2e6e4c6e80a711ec8" 12 "
14SRC_URI[sha256sum] = "1b4a02758fb68a65ea986d808867f1d6383219c234aef553a8741818e795b529" 13SRC_URI[md5sum] = "4fc754be7ec3e0f80b042d907e99f4ad"
14SRC_URI[sha256sum] = "8088221e6e27da8d5907729f0bfe798f526836f22cc59ae83a0f867e67416a3e"
15 15
16UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" 16UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
17UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" 17UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/python-numpy/python-numpy_1.14.5.bb b/meta/recipes-devtools/python-numpy/python-numpy_1.16.2.bb
index 50137895ca..50137895ca 100644
--- a/meta/recipes-devtools/python-numpy/python-numpy_1.14.5.bb
+++ b/meta/recipes-devtools/python-numpy/python-numpy_1.16.2.bb
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.14.5.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.16.2.bb
index 915e6f8c2b..d388e88d25 100644
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.14.5.bb
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.16.2.bb
@@ -1,2 +1,3 @@
1inherit setuptools3 1inherit setuptools3
2require python-numpy.inc 2require python-numpy.inc
3