summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-01-15 17:08:40 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-01-19 12:21:23 +0000
commitb682671cfb38ec5a256a14a401f812d010a5aec8 (patch)
treea06433929f94e3e025fe224f577b8682d50b8ca7
parente100286f5359bb74a870fe0971b202c338e7dc41 (diff)
downloadpoky-b682671cfb38ec5a256a14a401f812d010a5aec8.tar.gz
python3-numpy: upgrade 1.26.2 -> 1.26.3
0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch refreshed for 1.26.3 Changelog: https://github.com/numpy/numpy/releases/tag/v1.26.3 (From OE-Core rev: 04d1c142274702726f8fc7afed7420d9e6f07ddd) 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>
-rw-r--r--meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch10
-rw-r--r--meta/recipes-devtools/python/python3-numpy_1.26.3.bb (renamed from meta/recipes-devtools/python/python3-numpy_1.26.2.bb)2
2 files changed, 5 insertions, 7 deletions
diff --git a/meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch b/meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
index 9f5f25f9b5..bbe309c556 100644
--- a/meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
+++ b/meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch
@@ -1,4 +1,4 @@
1From 27f6687e49bf555fc494d2f14bae6ecd0fa30f14 Mon Sep 17 00:00:00 2001 1From 46eea664cf89d0602e7ff16d587c37c045b125b7 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
@@ -8,15 +8,16 @@ Subject: [PATCH] Don't search /usr and so on for libraries by default to
8Upstream-Status: Inappropriate (As the code stands, this is a hack) 8Upstream-Status: Inappropriate (As the code stands, this is a hack)
9Signed-off-by: Ross Burton <ross.burton@intel.com> 9Signed-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 numpy/distutils/system_info.py | 42 +++++----------------------------- 13 numpy/distutils/system_info.py | 42 +++++-----------------------------
13 1 file changed, 6 insertions(+), 36 deletions(-) 14 1 file changed, 6 insertions(+), 36 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 82e864a..135246d 100644 17index feb28f6..a48d6d1 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@@ -323,44 +323,14 @@ if sys.platform == 'win32': 20@@ -327,44 +327,14 @@ def add_system_root(library_root):
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:
@@ -67,6 +68,3 @@ index 82e864a..135246d 100644
67 68
68 if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: 69 if os.path.join(sys.prefix, 'lib') not in default_lib_dirs:
69 default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) 70 default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib'))
70--
712.25.1
72
diff --git a/meta/recipes-devtools/python/python3-numpy_1.26.2.bb b/meta/recipes-devtools/python/python3-numpy_1.26.3.bb
index 253b334367..023d40a9b2 100644
--- a/meta/recipes-devtools/python/python3-numpy_1.26.2.bb
+++ b/meta/recipes-devtools/python/python3-numpy_1.26.3.bb
@@ -13,7 +13,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${SRCNAME}-${PV}.tar.gz \
13 file://fix_reproducibility.patch \ 13 file://fix_reproducibility.patch \
14 file://run-ptest \ 14 file://run-ptest \
15 " 15 "
16SRC_URI[sha256sum] = "f65738447676ab5777f11e6bbbdb8ce11b785e105f690bc45966574816b6d3ea" 16SRC_URI[sha256sum] = "697df43e2b6310ecc9d95f05d5ef20eacc09c7c4ecc9da3f235d39e71b7da1e4"
17 17
18GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases" 18GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases"
19UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$" 19UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$"