mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 21:49:33 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
c17113f1e2
commit
ab840563bc
@@ -1,4 +1,4 @@
|
|||||||
From c14554c7e2fff8dd559dfb41e7dd11392c6f85e3 Mon Sep 17 00:00:00 2001
|
From 672a75c8417ce08db9e31fc415ec445479231d5a Mon Sep 17 00:00:00 2001
|
||||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||||
Date: Thu, 10 Dec 2015 13:20:30 +0200
|
Date: Thu, 10 Dec 2015 13:20:30 +0200
|
||||||
Subject: [PATCH] Don't search /usr and so on for libraries by default to
|
Subject: [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>
|
|||||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||||
|
|
||||||
---
|
---
|
||||||
numpy/distutils/system_info.py | 50 ++++------------------------------
|
numpy/distutils/system_info.py | 42 ++++------------------------------
|
||||||
1 file changed, 6 insertions(+), 44 deletions(-)
|
1 file changed, 5 insertions(+), 37 deletions(-)
|
||||||
|
|
||||||
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
|
diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
|
||||||
index 2424943..bf56a6d 100644
|
index ba2b1f4..f94dce1 100644
|
||||||
--- a/numpy/distutils/system_info.py
|
--- a/numpy/distutils/system_info.py
|
||||||
+++ b/numpy/distutils/system_info.py
|
+++ b/numpy/distutils/system_info.py
|
||||||
@@ -274,51 +274,13 @@ if sys.platform == 'win32':
|
@@ -278,45 +278,13 @@ if sys.platform == 'win32':
|
||||||
add_system_root(os.path.join(conda_dir, 'Library'))
|
add_system_root(os.path.join(conda_dir, 'Library'))
|
||||||
|
|
||||||
else:
|
else:
|
||||||
@@ -45,31 +45,24 @@ index 2424943..bf56a6d 100644
|
|||||||
- default_x11_include_dirs.extend(['/usr/lib/X11/include',
|
- default_x11_include_dirs.extend(['/usr/lib/X11/include',
|
||||||
- '/usr/include/X11'])
|
- '/usr/include/X11'])
|
||||||
-
|
-
|
||||||
- import subprocess as sp
|
- with open(os.devnull, 'w') as tmp:
|
||||||
- tmp = None
|
- try:
|
||||||
- try:
|
- p = subprocess.Popen(["gcc", "-print-multiarch"], stdout=subprocess.PIPE,
|
||||||
- # Explicitly open/close file to avoid ResourceWarning when
|
- stderr=tmp)
|
||||||
- # tests are run in debug mode Python 3.
|
- except (OSError, DistutilsError):
|
||||||
- tmp = open(os.devnull, 'w')
|
- # OSError if gcc is not installed, or SandboxViolation (DistutilsError
|
||||||
- p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.PIPE,
|
- # subclass) if an old setuptools bug is triggered (see gh-3160).
|
||||||
- stderr=tmp)
|
- pass
|
||||||
- except (OSError, DistutilsError):
|
- else:
|
||||||
- # OSError if gcc is not installed, or SandboxViolation (DistutilsError
|
- triplet = str(p.communicate()[0].decode().strip())
|
||||||
- # subclass) if an old setuptools bug is triggered (see gh-3160).
|
- if p.returncode == 0:
|
||||||
- pass
|
- # gcc supports the "-print-multiarch" option
|
||||||
- else:
|
- default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)]
|
||||||
- triplet = str(p.communicate()[0].decode().strip())
|
- default_lib_dirs += [os.path.join("/usr/lib/", triplet)]
|
||||||
- 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)]
|
|
||||||
- finally:
|
|
||||||
- if tmp is not None:
|
|
||||||
- tmp.close()
|
|
||||||
+ default_lib_dirs = libpaths(['/deadir/lib'], platform_bits)
|
+ default_lib_dirs = libpaths(['/deadir/lib'], platform_bits)
|
||||||
+ default_include_dirs = ['/deaddir/include']
|
+ default_include_dirs = ['/deaddir/include']
|
||||||
+ default_src_dirs = ['.', '/deaddir/src']
|
+ default_src_dirs = ['.', '/deaddir/src']
|
||||||
+
|
|
||||||
+ default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits)
|
+ default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits)
|
||||||
+ default_x11_include_dirs = ['/deaddir/include']
|
+ default_x11_include_dirs = ['/deaddir/include']
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
From b881e0b2ba9cf1a4aa351a1c1ea90b1e1776ce21 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||||
|
Date: Mon, 12 Aug 2019 15:37:36 +0200
|
||||||
|
Subject: [PATCH] numpy/random/setup.py: remove the detection of x86 targets
|
||||||
|
via uname()
|
||||||
|
|
||||||
|
This was badly breaking compilation for ARM targets (and possibly
|
||||||
|
other non-x86 targets); if -msse2 is desirable for x86 builds it has
|
||||||
|
to be passed through another channel.
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe-core specific]
|
||||||
|
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||||
|
---
|
||||||
|
numpy/random/setup.py | 5 -----
|
||||||
|
1 file changed, 5 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/numpy/random/setup.py b/numpy/random/setup.py
|
||||||
|
index a1bf3b8..60fb534 100644
|
||||||
|
--- a/numpy/random/setup.py
|
||||||
|
+++ b/numpy/random/setup.py
|
||||||
|
@@ -49,11 +49,6 @@ def configuration(parent_package='', top_path=None):
|
||||||
|
elif not is_msvc:
|
||||||
|
# Some bit generators require c99
|
||||||
|
EXTRA_COMPILE_ARGS += ['-std=c99']
|
||||||
|
- INTEL_LIKE = any([val in k.lower() for k in platform.uname()
|
||||||
|
- for val in ('x86', 'i686', 'i386', 'amd64')])
|
||||||
|
- if INTEL_LIKE:
|
||||||
|
- # Assumes GCC or GCC-like compiler
|
||||||
|
- EXTRA_COMPILE_ARGS += ['-msse2']
|
||||||
|
|
||||||
|
# Use legacy integer variable sizes
|
||||||
|
LEGACY_DEFS = [('NP_RANDOM_LEGACY', '1')]
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
SUMMARY = "A sophisticated Numeric Processing Package for Python"
|
SUMMARY = "A sophisticated Numeric Processing Package for Python"
|
||||||
SECTION = "devel/python"
|
SECTION = "devel/python"
|
||||||
LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD"
|
LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT"
|
||||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231"
|
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1"
|
||||||
|
|
||||||
SRCNAME = "numpy"
|
SRCNAME = "numpy"
|
||||||
|
|
||||||
@@ -9,13 +9,17 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S
|
|||||||
file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
|
file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \
|
||||||
file://0001-npy_cpu-Add-riscv-support.patch \
|
file://0001-npy_cpu-Add-riscv-support.patch \
|
||||||
${CONFIGFILESURI} \
|
${CONFIGFILESURI} \
|
||||||
|
file://0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "0886e5b5017f08f2b7a624c0b5931e61"
|
SRC_URI[md5sum] = "c48b2ad785f82cdfe28c907ce35e2a71"
|
||||||
SRC_URI[sha256sum] = "adf063a3f87ab89393f5eea0eb903293b112fa0a308e8c594a75ffa585d81d4f"
|
SRC_URI[sha256sum] = "47b7b6145e7ba5918ce26be25999b6d4b35cf9fbfdf46b7da50090ffdb020445"
|
||||||
|
|
||||||
UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
|
UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
|
||||||
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
|
UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
|
||||||
|
|
||||||
|
# Needed for building with gcc 4.x from centos 7
|
||||||
|
CFLAGS_append_class-native = " -std=c99"
|
||||||
|
|
||||||
CONFIGFILESURI ?= ""
|
CONFIGFILESURI ?= ""
|
||||||
|
|
||||||
CONFIGFILESURI_aarch64 = " \
|
CONFIGFILESURI_aarch64 = " \
|
||||||
|
|||||||
Reference in New Issue
Block a user