deleted file mode 100644
@@ -1,69 +0,0 @@
-From e6a9ec520a5924af57ad5d117bc45cf6d8bcdb9a Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Thu, 10 Dec 2015 13:20:30 +0200
-Subject: [PATCH] Don't search /usr and so on for libraries by default to
-
- avoid host contamination.
-
-Upstream-Status: Inappropriate (As the code stands, this is a hack)
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- numpy/distutils/system_info.py | 42 +++++-----------------------------
- 1 file changed, 6 insertions(+), 36 deletions(-)
-
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index e428b47..65d95ed 100644
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -326,44 +326,14 @@ def add_system_root(library_root):
- add_system_root(os.path.join(conda_dir, 'Library'))
-
- else:
-- default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib',
-- '/opt/local/lib', '/sw/lib'], platform_bits)
- default_runtime_dirs = []
-- default_include_dirs = ['/usr/local/include',
-- '/opt/include',
-- # path of umfpack under macports
-- '/opt/local/include/ufsparse',
-- '/opt/local/include', '/sw/include',
-- '/usr/include/suitesparse']
-- default_src_dirs = ['.', '/usr/local/src', '/opt/src', '/sw/src']
--
-- default_x11_lib_dirs = libpaths(['/usr/X11R6/lib', '/usr/X11/lib',
-- '/usr/lib'], platform_bits)
-- default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include']
--
-- if os.path.exists('/usr/lib/X11'):
-- globbed_x11_dir = glob('/usr/lib/*/libX11.so')
-- if globbed_x11_dir:
-- x11_so_dir = os.path.split(globbed_x11_dir[0])[0]
-- default_x11_lib_dirs.extend([x11_so_dir, '/usr/lib/X11'])
-- default_x11_include_dirs.extend(['/usr/lib/X11/include',
-- '/usr/include/X11'])
--
-- with open(os.devnull, 'w') as tmp:
-- try:
-- p = subprocess.Popen(["gcc", "-print-multiarch"], stdout=subprocess.PIPE,
-- stderr=tmp)
-- except (OSError, DistutilsError):
-- # OSError if gcc is not installed, or SandboxViolation (DistutilsError
-- # subclass) if an old setuptools bug is triggered (see gh-3160).
-- pass
-- else:
-- triplet = str(p.communicate()[0].decode().strip())
-- if p.returncode == 0:
-- # gcc supports the "-print-multiarch" option
-- default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)]
-- default_lib_dirs += [os.path.join("/usr/lib/", triplet)]
-
-+ default_lib_dirs = libpaths(['/deadir/lib'], platform_bits)
-+ default_include_dirs = ['/deaddir/include']
-+ default_src_dirs = ['.', '/deaddir/src']
-+
-+ default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits)
-+ default_x11_include_dirs = ['/deaddir/include']
-
- if os.path.join(sys.prefix, 'lib') not in default_lib_dirs:
- default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib'))
deleted file mode 100644
@@ -1,40 +0,0 @@
-From b8bae174cfca4541a7288edcfdbc340d54f2673a Mon Sep 17 00:00:00 2001
-From: Richard Purdie <richard.purdie@linuxfoundation.org>
-Date: Fri, 29 Sep 2023 22:53:24 +0100
-Subject: [PATCH] This regex decides whether to use O3 opimisation on numpy or
- not.
-
-It includes "od", which happens to be a substring of "reproducible"
-but not "qemux86-world".
-
-The regex will run against all compiler options including things like:
-
--fmacro-prefix-map=/XXX/build/tmp/work/core2-64-poky-linux/python3-numpy/1.26.0/numpy-1.26.0=/usr/src/debug/python3-numpy/1.26.0-r0
-
-i.e. including build paths.
-
-Reduce the regex to something deterministic for our builds, assuming
-nobody builds in /home/debug:full/
-
-The autobuilder race depended upon whether qemux86-world or the
-reproducible target ran first and won the race to populate sstate.
-
-Upstream-Status: Inappropriate [upstream have dropped distutils and switched to meson]
-Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
----
- numpy/distutils/ccompiler_opt.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/numpy/distutils/ccompiler_opt.py b/numpy/distutils/ccompiler_opt.py
-index 4dea2f9..00f563f 100644
---- a/numpy/distutils/ccompiler_opt.py
-+++ b/numpy/distutils/ccompiler_opt.py
-@@ -991,7 +991,7 @@ def __init__(self):
- ("cc_is_nocc", "", ""),
- )
- detect_args = (
-- ("cc_has_debug", ".*(O0|Od|ggdb|coverage|debug:full).*", ""),
-+ ("cc_has_debug", ".*debug:full.*", ""),
- ("cc_has_native",
- ".*(-march=native|-xHost|/QxHost|-mcpu=a64fx).*", ""),
- # in case if the class run with -DNPY_DISABLE_OPTIMIZATION
similarity index 93%
rename from meta/recipes-devtools/python/python3-numpy_2.4.6.bb
rename to meta/recipes-devtools/python/python3-numpy_2.5.0.bb
@@ -8,12 +8,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=26080bf81b2662c7119d3ef28ae197fd"
SRCNAME = "numpy"
SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${SRCNAME}-${PV}.tar.gz \
- file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
- file://fix_reproducibility.patch \
file://run-ptest \
file://0001-python-sysroot.patch \
"
-SRC_URI[sha256sum] = "f3a3570c4a2a16746ac2c31a7c7c7b0c186b95ce902e33db6f28094ed7387dda"
+SRC_URI[sha256sum] = "5a129578019311b6e56bdd714250f19b518f7dceeeb8d1af5490f4942d3f891c"
GITHUB_BASE_URI = "https://github.com/numpy/numpy/releases"
UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)+)$"
Upgrade to release 2.5.0: Numpy 2.5.0 is a transitional release. It drops support for Python 3.11, marking the end of distutils, and expires a large number of deprecations made in the 2.0.x release. It also improves free threading and brings sorting into compliance with the array-api standard with the addition of descending sorts. There is also a fair amount of preparation for Python 3.15, which will be supported starting with the first rc. - Distutils has been removed - Many expired deprecations - Many new deprecations - Many static typing improvements - Improved support for free threading - Support for descending sorts Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- ...-and-so-on-for-libraries-by-default-.patch | 69 ------------------- .../python3-numpy/fix_reproducibility.patch | 40 ----------- ...-numpy_2.4.6.bb => python3-numpy_2.5.0.bb} | 4 +- 3 files changed, 1 insertion(+), 112 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3-numpy/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch delete mode 100644 meta/recipes-devtools/python/python3-numpy/fix_reproducibility.patch rename meta/recipes-devtools/python/{python3-numpy_2.4.6.bb => python3-numpy_2.5.0.bb} (93%)