summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-08-22 17:07:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-28 11:31:21 +0100
commitab840563bc4aa53d672c113c43d1cdeb2e1f88c1 (patch)
tree8a65911a27e109c1c57838371cb00761a1133666 /meta/recipes-devtools
parentc17113f1e2e7bd8ab019169660718fab81df16fb (diff)
downloadpoky-ab840563bc4aa53d672c113c43d1cdeb2e1f88c1.tar.gz
python3-numpy: update to 1.17.0
Rebase files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch License-Update: clarified license for numpy/core/src/multiarray/dragon4.c (it is MIT) (From OE-Core rev: e11982182acc65913c6e3438304e8a15fe3792a2) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch47
-rw-r--r--meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch32
-rw-r--r--meta/recipes-devtools/python-numpy/python-numpy.inc12
-rw-r--r--meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb (renamed from meta/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb)0
4 files changed, 60 insertions, 31 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 8fe0d1a27e..98a9705831 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,4 +1,4 @@
1From c14554c7e2fff8dd559dfb41e7dd11392c6f85e3 Mon Sep 17 00:00:00 2001 1From 672a75c8417ce08db9e31fc415ec445479231d5a 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] 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
@@ -10,14 +10,14 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11 11
12--- 12---
13 numpy/distutils/system_info.py | 50 ++++------------------------------ 13 numpy/distutils/system_info.py | 42 ++++------------------------------
14 1 file changed, 6 insertions(+), 44 deletions(-) 14 1 file changed, 5 insertions(+), 37 deletions(-)
15 15
16diff --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
17index 2424943..bf56a6d 100644 17index ba2b1f4..f94dce1 100644
18--- a/numpy/distutils/system_info.py 18--- a/numpy/distutils/system_info.py
19+++ b/numpy/distutils/system_info.py 19+++ b/numpy/distutils/system_info.py
20@@ -274,51 +274,13 @@ if sys.platform == 'win32': 20@@ -278,45 +278,13 @@ if sys.platform == 'win32':
21 add_system_root(os.path.join(conda_dir, 'Library')) 21 add_system_root(os.path.join(conda_dir, 'Library'))
22 22
23 else: 23 else:
@@ -45,31 +45,24 @@ index 2424943..bf56a6d 100644
45- default_x11_include_dirs.extend(['/usr/lib/X11/include', 45- default_x11_include_dirs.extend(['/usr/lib/X11/include',
46- '/usr/include/X11']) 46- '/usr/include/X11'])
47- 47-
48- import subprocess as sp 48- with open(os.devnull, 'w') as tmp:
49- tmp = None 49- try:
50- try: 50- p = subprocess.Popen(["gcc", "-print-multiarch"], stdout=subprocess.PIPE,
51- # Explicitly open/close file to avoid ResourceWarning when 51- stderr=tmp)
52- # tests are run in debug mode Python 3. 52- except (OSError, DistutilsError):
53- tmp = open(os.devnull, 'w') 53- # OSError if gcc is not installed, or SandboxViolation (DistutilsError
54- p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.PIPE, 54- # subclass) if an old setuptools bug is triggered (see gh-3160).
55- stderr=tmp) 55- pass
56- except (OSError, DistutilsError): 56- else:
57- # OSError if gcc is not installed, or SandboxViolation (DistutilsError 57- triplet = str(p.communicate()[0].decode().strip())
58- # subclass) if an old setuptools bug is triggered (see gh-3160). 58- if p.returncode == 0:
59- pass 59- # gcc supports the "-print-multiarch" option
60- else: 60- default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)]
61- triplet = str(p.communicate()[0].decode().strip()) 61- default_lib_dirs += [os.path.join("/usr/lib/", triplet)]
62- if p.returncode == 0:
63- # gcc supports the "-print-multiarch" option
64- default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)]
65- default_lib_dirs += [os.path.join("/usr/lib/", triplet)]
66- finally:
67- if tmp is not None:
68- tmp.close()
69+ default_lib_dirs = libpaths(['/deadir/lib'], platform_bits) 62+ default_lib_dirs = libpaths(['/deadir/lib'], platform_bits)
70+ default_include_dirs = ['/deaddir/include'] 63+ default_include_dirs = ['/deaddir/include']
71+ default_src_dirs = ['.', '/deaddir/src'] 64+ default_src_dirs = ['.', '/deaddir/src']
72+ 65
73+ default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits) 66+ default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits)
74+ default_x11_include_dirs = ['/deaddir/include'] 67+ default_x11_include_dirs = ['/deaddir/include']
75 68
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
new file mode 100644
index 0000000000..ebb2a6f9df
--- /dev/null
+++ b/meta/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch
@@ -0,0 +1,32 @@
1From b881e0b2ba9cf1a4aa351a1c1ea90b1e1776ce21 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Mon, 12 Aug 2019 15:37:36 +0200
4Subject: [PATCH] numpy/random/setup.py: remove the detection of x86 targets
5 via uname()
6
7This was badly breaking compilation for ARM targets (and possibly
8other non-x86 targets); if -msse2 is desirable for x86 builds it has
9to be passed through another channel.
10
11Upstream-Status: Inappropriate [oe-core specific]
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13---
14 numpy/random/setup.py | 5 -----
15 1 file changed, 5 deletions(-)
16
17diff --git a/numpy/random/setup.py b/numpy/random/setup.py
18index a1bf3b8..60fb534 100644
19--- a/numpy/random/setup.py
20+++ b/numpy/random/setup.py
21@@ -49,11 +49,6 @@ def configuration(parent_package='', top_path=None):
22 elif not is_msvc:
23 # Some bit generators require c99
24 EXTRA_COMPILE_ARGS += ['-std=c99']
25- INTEL_LIKE = any([val in k.lower() for k in platform.uname()
26- for val in ('x86', 'i686', 'i386', 'amd64')])
27- if INTEL_LIKE:
28- # Assumes GCC or GCC-like compiler
29- EXTRA_COMPILE_ARGS += ['-msse2']
30
31 # Use legacy integer variable sizes
32 LEGACY_DEFS = [('NP_RANDOM_LEGACY', '1')]
diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc b/meta/recipes-devtools/python-numpy/python-numpy.inc
index 43c3053cd8..1c6047ab07 100644
--- a/meta/recipes-devtools/python-numpy/python-numpy.inc
+++ b/meta/recipes-devtools/python-numpy/python-numpy.inc
@@ -1,7 +1,7 @@
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 & MIT"
4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231" 4LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1"
5 5
6SRCNAME = "numpy" 6SRCNAME = "numpy"
7 7
@@ -9,13 +9,17 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S
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 \ 10 file://0001-npy_cpu-Add-riscv-support.patch \
11 ${CONFIGFILESURI} \ 11 ${CONFIGFILESURI} \
12 file://0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch \
12 " 13 "
13SRC_URI[md5sum] = "0886e5b5017f08f2b7a624c0b5931e61" 14SRC_URI[md5sum] = "c48b2ad785f82cdfe28c907ce35e2a71"
14SRC_URI[sha256sum] = "adf063a3f87ab89393f5eea0eb903293b112fa0a308e8c594a75ffa585d81d4f" 15SRC_URI[sha256sum] = "47b7b6145e7ba5918ce26be25999b6d4b35cf9fbfdf46b7da50090ffdb020445"
15 16
16UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" 17UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
17UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" 18UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
18 19
20# Needed for building with gcc 4.x from centos 7
21CFLAGS_append_class-native = " -std=c99"
22
19CONFIGFILESURI ?= "" 23CONFIGFILESURI ?= ""
20 24
21CONFIGFILESURI_aarch64 = " \ 25CONFIGFILESURI_aarch64 = " \
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb
index d388e88d25..d388e88d25 100644
--- a/meta/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb
+++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb