summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-08-09 07:19:21 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-13 09:27:38 +0100
commit9b32a558f663502d119b94264fa6cfa98086cb52 (patch)
treead94e8731c3f894960fa533a280be7b7deaa8f7e /meta
parent43d52e785b42a9b38419ae2959cc5983bd017deb (diff)
downloadpoky-9b32a558f663502d119b94264fa6cfa98086cb52.tar.gz
python-numpy: Upgrade to 1.13.1
Update LICENSE to BSD-3-Clause as per https://github.com/numpy/numpy/blob/master/LICENSE.txt LIC_FILES_CHKSUM changed due to copyright year change see https://github.com/numpy/numpy/commit/b2ff4f13197dd58508d3d025a9034519974750bd (From OE-Core rev: a703bb6159dd69020fb40db7a6a0811f45869972) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch24
-rw-r--r--meta/recipes-devtools/python-numpy/python-numpy_1.13.1.bb (renamed from meta/recipes-devtools/python-numpy/python-numpy_1.11.2.bb)15
-rw-r--r--meta/recipes-devtools/python-numpy/python3-numpy_1.13.1.bb (renamed from meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb)14
3 files changed, 25 insertions, 28 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 5b134edf07..ffd6ced136 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
@@ -11,11 +11,11 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11 numpy/distutils/system_info.py | 50 +++++------------------------------------- 11 numpy/distutils/system_info.py | 50 +++++-------------------------------------
12 1 file changed, 6 insertions(+), 44 deletions(-) 12 1 file changed, 6 insertions(+), 44 deletions(-)
13 13
14diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py 14Index: numpy-1.13.1/numpy/distutils/system_info.py
15index 9dd48e2..80e197a 100644 15===================================================================
16--- a/numpy/distutils/system_info.py 16--- numpy-1.13.1.orig/numpy/distutils/system_info.py
17+++ b/numpy/distutils/system_info.py 17+++ numpy-1.13.1/numpy/distutils/system_info.py
18@@ -204,51 +204,13 @@ if sys.platform == 'win32': 18@@ -211,51 +211,13 @@ if sys.platform == 'win32':
19 default_x11_lib_dirs = [] 19 default_x11_lib_dirs = []
20 default_x11_include_dirs = [] 20 default_x11_include_dirs = []
21 else: 21 else:
@@ -29,7 +29,10 @@ index 9dd48e2..80e197a 100644
29- '/opt/local/include', '/sw/include', 29- '/opt/local/include', '/sw/include',
30- '/usr/include/suitesparse'] 30- '/usr/include/suitesparse']
31- default_src_dirs = ['.', '/usr/local/src', '/opt/src', '/sw/src'] 31- default_src_dirs = ['.', '/usr/local/src', '/opt/src', '/sw/src']
32- 32+ default_lib_dirs = libpaths(['/deadir/lib'], platform_bits)
33+ default_include_dirs = ['/deaddir/include']
34+ default_src_dirs = ['.', '/deaddir/src']
35
33- default_x11_lib_dirs = libpaths(['/usr/X11R6/lib', '/usr/X11/lib', 36- default_x11_lib_dirs = libpaths(['/usr/X11R6/lib', '/usr/X11/lib',
34- '/usr/lib'], platform_bits) 37- '/usr/lib'], platform_bits)
35- default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include', 38- default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include',
@@ -50,7 +53,7 @@ index 9dd48e2..80e197a 100644
50- # tests are run in debug mode Python 3. 53- # tests are run in debug mode Python 3.
51- tmp = open(os.devnull, 'w') 54- tmp = open(os.devnull, 'w')
52- p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.PIPE, 55- p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.PIPE,
53- stderr=tmp) 56- stderr=tmp)
54- except (OSError, DistutilsError): 57- except (OSError, DistutilsError):
55- # OSError if gcc is not installed, or SandboxViolation (DistutilsError 58- # OSError if gcc is not installed, or SandboxViolation (DistutilsError
56- # subclass) if an old setuptools bug is triggered (see gh-3160). 59- # subclass) if an old setuptools bug is triggered (see gh-3160).
@@ -64,15 +67,8 @@ index 9dd48e2..80e197a 100644
64- finally: 67- finally:
65- if tmp is not None: 68- if tmp is not None:
66- tmp.close() 69- tmp.close()
67+ default_lib_dirs = libpaths(['/deadir/lib'], platform_bits)
68+ default_include_dirs = ['/deaddir/include']
69+ default_src_dirs = ['.', '/deaddir/src']
70+
71+ default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits) 70+ default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits)
72+ default_x11_include_dirs = ['/deaddir/include'] 71+ default_x11_include_dirs = ['/deaddir/include']
73 72
74 if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: 73 if os.path.join(sys.prefix, 'lib') not in default_lib_dirs:
75 default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) 74 default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib'))
76--
772.6.2
78
diff --git a/meta/recipes-devtools/python-numpy/python-numpy_1.11.2.bb b/meta/recipes-devtools/python-numpy/python-numpy_1.13.1.bb
index c4bc354036..63821d30fa 100644
--- a/meta/recipes-devtools/python-numpy/python-numpy_1.11.2.bb
+++ b/meta/recipes-devtools/python-numpy/python-numpy_1.13.1.bb
@@ -1,16 +1,20 @@
1SUMMARY = "A sophisticated Numeric Processing Package for Python" 1SUMMARY = "A sophisticated Numeric Processing Package for Python"
2SECTION = "devel/python" 2SECTION = "devel/python"
3LICENSE = "PSF" 3LICENSE = "BSD-3-Clause"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7e51a5677b22b865abbfb3dff6ffb2d0" 4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1002b09cd654fcaa2dcc87535acd9a96"
5 5
6SRCNAME = "numpy" 6SRCNAME = "numpy"
7 7
8SRC_URI = "https://files.pythonhosted.org/packages/source/n/${SRCNAME}/${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://remove-build-path-in-comments.patch \ 10 file://remove-build-path-in-comments.patch \
11 file://fix_shebang_f2py.patch \ 11 file://fix_shebang_f2py.patch \
12 ${CONFIGFILESURI} " 12 ${CONFIGFILESURI} "
13UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/numpy/files/" 13
14SRC_URI[md5sum] = "6d459e4a24f5035f720dda3c57716a92"
15SRC_URI[sha256sum] = "de020ec06f1e9ce1115a50161a38bf8d4c2525379900f9cb478cc613a1e7cd93"
16
17UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
14 18
15CONFIGFILESURI ?= "" 19CONFIGFILESURI ?= ""
16 20
@@ -81,9 +85,6 @@ do_compile_prepend_class-target() {
81 85
82FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a" 86FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a"
83 87
84SRC_URI[md5sum] = "03bd7927c314c43780271bf1ab795ebc"
85SRC_URI[sha256sum] = "04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69"
86
87# install what is needed for numpy.test() 88# install what is needed for numpy.test()
88RDEPENDS_${PN} = "python-unittest \ 89RDEPENDS_${PN} = "python-unittest \
89 python-difflib \ 90 python-difflib \
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.13.1.bb
index d5fe50c36f..0bf9e914f9 100644
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.11.2.bb
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.13.1.bb
@@ -1,16 +1,19 @@
1SUMMARY = "A sophisticated Numeric Processing Package for Python" 1SUMMARY = "A sophisticated Numeric Processing Package for Python"
2SECTION = "devel/python" 2SECTION = "devel/python"
3LICENSE = "PSF" 3LICENSE = "BSD-3-Clause"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7e51a5677b22b865abbfb3dff6ffb2d0" 4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1002b09cd654fcaa2dcc87535acd9a96"
5 5
6SRCNAME = "numpy" 6SRCNAME = "numpy"
7 7
8SRC_URI = "https://files.pythonhosted.org/packages/source/n/${SRCNAME}/${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://remove-build-path-in-comments.patch \ 10 file://remove-build-path-in-comments.patch \
11 file://fix_shebang_f2py.patch \ 11 file://fix_shebang_f2py.patch \
12 ${CONFIGFILESURI} " 12 ${CONFIGFILESURI} "
13UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/numpy/files/" 13SRC_URI[md5sum] = "6d459e4a24f5035f720dda3c57716a92"
14SRC_URI[sha256sum] = "de020ec06f1e9ce1115a50161a38bf8d4c2525379900f9cb478cc613a1e7cd93"
15
16UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
14 17
15CONFIGFILESURI ?= "" 18CONFIGFILESURI ?= ""
16 19
@@ -81,9 +84,6 @@ do_compile_prepend_class-target() {
81 84
82FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a" 85FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a"
83 86
84SRC_URI[md5sum] = "03bd7927c314c43780271bf1ab795ebc"
85SRC_URI[sha256sum] = "04db2fbd64e2e7c68e740b14402b25af51418fc43a59d9e54172b38b906b0f69"
86
87# install what is needed for numpy.test() 87# install what is needed for numpy.test()
88RDEPENDS_${PN} = "python3-unittest \ 88RDEPENDS_${PN} = "python3-unittest \
89 python3-difflib \ 89 python3-difflib \