diff options
author | wangmy <wangmy@fujitsu.com> | 2021-06-23 14:11:06 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-26 11:27:17 +0100 |
commit | d109c8d440a13a6bacd5e96cc8cab4e84d485b79 (patch) | |
tree | fe1509399d0a5fa1bca066c356b1d70f4f1da3c0 /meta/recipes-devtools | |
parent | 549bb5a31b9dde7d0bc1ee13d5e04d13772035fc (diff) | |
download | poky-d109c8d440a13a6bacd5e96cc8cab4e84d485b79.tar.gz |
python3-numpy: upgrade 1.20.3 -> 1.21.0
refresh 0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
License-Updage: Copyright year updated to 2021
(From OE-Core rev: f2ad567dbcb846f39fbdbd8e4e432cd2d1bd0d0a)
(From OE-Core rev: 71ca892db9cb863245f9cbf67bb65afb39ef7853)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.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-.patch | 19 | ||||
-rw-r--r-- | meta/recipes-devtools/python-numpy/python3-numpy_1.21.0.bb (renamed from meta/recipes-devtools/python-numpy/python3-numpy_1.20.3.bb) | 4 |
2 files changed, 11 insertions, 12 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 cdb6a473d2..9f5f25f9b5 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 | |||
@@ -8,16 +8,15 @@ Subject: [PATCH] Don't search /usr and so on for libraries by default to | |||
8 | Upstream-Status: Inappropriate (As the code stands, this is a hack) | 8 | Upstream-Status: Inappropriate (As the code stands, this is a hack) |
9 | Signed-off-by: Ross Burton <ross.burton@intel.com> | 9 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
11 | |||
12 | --- | 11 | --- |
13 | numpy/distutils/system_info.py | 42 ++++------------------------------ | 12 | numpy/distutils/system_info.py | 42 +++++----------------------------- |
14 | 1 file changed, 5 insertions(+), 37 deletions(-) | 13 | 1 file changed, 6 insertions(+), 36 deletions(-) |
15 | 14 | ||
16 | diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py | 15 | diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py |
17 | index 3a6a7b2..6c2c3da 100644 | 16 | index 82e864a..135246d 100644 |
18 | --- a/numpy/distutils/system_info.py | 17 | --- a/numpy/distutils/system_info.py |
19 | +++ b/numpy/distutils/system_info.py | 18 | +++ b/numpy/distutils/system_info.py |
20 | @@ -309,45 +309,13 @@ if sys.platform == 'win32': | 19 | @@ -323,44 +323,14 @@ if sys.platform == 'win32': |
21 | add_system_root(os.path.join(conda_dir, 'Library')) | 20 | add_system_root(os.path.join(conda_dir, 'Library')) |
22 | 21 | ||
23 | else: | 22 | else: |
@@ -25,7 +24,7 @@ index 3a6a7b2..6c2c3da 100644 | |||
25 | - '/opt/local/lib', '/sw/lib'], platform_bits) | 24 | - '/opt/local/lib', '/sw/lib'], platform_bits) |
26 | default_runtime_dirs = [] | 25 | default_runtime_dirs = [] |
27 | - default_include_dirs = ['/usr/local/include', | 26 | - default_include_dirs = ['/usr/local/include', |
28 | - '/opt/include', '/usr/include', | 27 | - '/opt/include', |
29 | - # path of umfpack under macports | 28 | - # path of umfpack under macports |
30 | - '/opt/local/include/ufsparse', | 29 | - '/opt/local/include/ufsparse', |
31 | - '/opt/local/include', '/sw/include', | 30 | - '/opt/local/include', '/sw/include', |
@@ -34,8 +33,7 @@ index 3a6a7b2..6c2c3da 100644 | |||
34 | - | 33 | - |
35 | - default_x11_lib_dirs = libpaths(['/usr/X11R6/lib', '/usr/X11/lib', | 34 | - default_x11_lib_dirs = libpaths(['/usr/X11R6/lib', '/usr/X11/lib', |
36 | - '/usr/lib'], platform_bits) | 35 | - '/usr/lib'], platform_bits) |
37 | - default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include', | 36 | - default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include'] |
38 | - '/usr/include'] | ||
39 | - | 37 | - |
40 | - if os.path.exists('/usr/lib/X11'): | 38 | - if os.path.exists('/usr/lib/X11'): |
41 | - globbed_x11_dir = glob('/usr/lib/*/libX11.so') | 39 | - globbed_x11_dir = glob('/usr/lib/*/libX11.so') |
@@ -59,15 +57,16 @@ index 3a6a7b2..6c2c3da 100644 | |||
59 | - # gcc supports the "-print-multiarch" option | 57 | - # gcc supports the "-print-multiarch" option |
60 | - default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)] | 58 | - default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)] |
61 | - default_lib_dirs += [os.path.join("/usr/lib/", triplet)] | 59 | - default_lib_dirs += [os.path.join("/usr/lib/", triplet)] |
60 | |||
62 | + default_lib_dirs = libpaths(['/deadir/lib'], platform_bits) | 61 | + default_lib_dirs = libpaths(['/deadir/lib'], platform_bits) |
63 | + default_include_dirs = ['/deaddir/include'] | 62 | + default_include_dirs = ['/deaddir/include'] |
64 | + default_src_dirs = ['.', '/deaddir/src'] | 63 | + default_src_dirs = ['.', '/deaddir/src'] |
65 | 64 | + | |
66 | + default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits) | 65 | + default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits) |
67 | + default_x11_include_dirs = ['/deaddir/include'] | 66 | + default_x11_include_dirs = ['/deaddir/include'] |
68 | 67 | ||
69 | if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: | 68 | if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: |
70 | default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) | 69 | default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) |
71 | -- | 70 | -- |
72 | 2.17.1 | 71 | 2.25.1 |
73 | 72 | ||
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.20.3.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.21.0.bb index d160fd655b..7ad2f061bf 100644 --- a/meta/recipes-devtools/python-numpy/python3-numpy_1.20.3.bb +++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.21.0.bb | |||
@@ -3,7 +3,7 @@ HOMEPAGE = "https://numpy.org/" | |||
3 | DESCRIPTION = "NumPy is the fundamental package needed for scientific computing with Python." | 3 | DESCRIPTION = "NumPy is the fundamental package needed for scientific computing with Python." |
4 | SECTION = "devel/python" | 4 | SECTION = "devel/python" |
5 | LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT" | 5 | LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT" |
6 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=aa1ecaef18152f75bfae546b29c49d3c" | 6 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b076ad374a7d311ba3126a22b2d52596" |
7 | 7 | ||
8 | SRCNAME = "numpy" | 8 | SRCNAME = "numpy" |
9 | 9 | ||
@@ -12,7 +12,7 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S | |||
12 | file://0001-numpy-core-Define-RISCV-32-support.patch \ | 12 | file://0001-numpy-core-Define-RISCV-32-support.patch \ |
13 | file://run-ptest \ | 13 | file://run-ptest \ |
14 | " | 14 | " |
15 | SRC_URI[sha256sum] = "b7340f0628ce1823c151e3d2a2a8cba2a3ff1357fba4475a24b1816e75c21f90" | 15 | SRC_URI[sha256sum] = "b662c841b29848c04d9134f31dbaa7d4c8e673f45bb3a5f28d02f49c424d558a" |
16 | 16 | ||
17 | UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" | 17 | UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" |
18 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" | 18 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" |