diff options
Diffstat (limited to 'meta-python/recipes-devtools/python-numpy')
4 files changed, 0 insertions, 157 deletions
diff --git a/meta-python/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch b/meta-python/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch deleted file mode 100644 index 98a9705831..0000000000 --- a/meta-python/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +++ /dev/null | |||
| @@ -1,70 +0,0 @@ | |||
| 1 | From 672a75c8417ce08db9e31fc415ec445479231d5a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Thu, 10 Dec 2015 13:20:30 +0200 | ||
| 4 | Subject: [PATCH] Don't search /usr and so on for libraries by default to | ||
| 5 | |||
| 6 | avoid host contamination. | ||
| 7 | |||
| 8 | Upstream-Status: Inappropriate (As the code stands, this is a hack) | ||
| 9 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
| 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 11 | |||
| 12 | --- | ||
| 13 | numpy/distutils/system_info.py | 42 ++++------------------------------ | ||
| 14 | 1 file changed, 5 insertions(+), 37 deletions(-) | ||
| 15 | |||
| 16 | diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py | ||
| 17 | index ba2b1f4..f94dce1 100644 | ||
| 18 | --- a/numpy/distutils/system_info.py | ||
| 19 | +++ b/numpy/distutils/system_info.py | ||
| 20 | @@ -278,45 +278,13 @@ if sys.platform == 'win32': | ||
| 21 | add_system_root(os.path.join(conda_dir, 'Library')) | ||
| 22 | |||
| 23 | else: | ||
| 24 | - default_lib_dirs = libpaths(['/usr/local/lib', '/opt/lib', '/usr/lib', | ||
| 25 | - '/opt/local/lib', '/sw/lib'], platform_bits) | ||
| 26 | default_runtime_dirs = [] | ||
| 27 | - default_include_dirs = ['/usr/local/include', | ||
| 28 | - '/opt/include', '/usr/include', | ||
| 29 | - # path of umfpack under macports | ||
| 30 | - '/opt/local/include/ufsparse', | ||
| 31 | - '/opt/local/include', '/sw/include', | ||
| 32 | - '/usr/include/suitesparse'] | ||
| 33 | - default_src_dirs = ['.', '/usr/local/src', '/opt/src', '/sw/src'] | ||
| 34 | - | ||
| 35 | - default_x11_lib_dirs = libpaths(['/usr/X11R6/lib', '/usr/X11/lib', | ||
| 36 | - '/usr/lib'], platform_bits) | ||
| 37 | - default_x11_include_dirs = ['/usr/X11R6/include', '/usr/X11/include', | ||
| 38 | - '/usr/include'] | ||
| 39 | - | ||
| 40 | - if os.path.exists('/usr/lib/X11'): | ||
| 41 | - globbed_x11_dir = glob('/usr/lib/*/libX11.so') | ||
| 42 | - if globbed_x11_dir: | ||
| 43 | - x11_so_dir = os.path.split(globbed_x11_dir[0])[0] | ||
| 44 | - default_x11_lib_dirs.extend([x11_so_dir, '/usr/lib/X11']) | ||
| 45 | - default_x11_include_dirs.extend(['/usr/lib/X11/include', | ||
| 46 | - '/usr/include/X11']) | ||
| 47 | - | ||
| 48 | - with open(os.devnull, 'w') as tmp: | ||
| 49 | - try: | ||
| 50 | - p = subprocess.Popen(["gcc", "-print-multiarch"], stdout=subprocess.PIPE, | ||
| 51 | - stderr=tmp) | ||
| 52 | - except (OSError, DistutilsError): | ||
| 53 | - # OSError if gcc is not installed, or SandboxViolation (DistutilsError | ||
| 54 | - # subclass) if an old setuptools bug is triggered (see gh-3160). | ||
| 55 | - pass | ||
| 56 | - else: | ||
| 57 | - triplet = str(p.communicate()[0].decode().strip()) | ||
| 58 | - if p.returncode == 0: | ||
| 59 | - # gcc supports the "-print-multiarch" option | ||
| 60 | - default_x11_lib_dirs += [os.path.join("/usr/lib/", triplet)] | ||
| 61 | - default_lib_dirs += [os.path.join("/usr/lib/", triplet)] | ||
| 62 | + default_lib_dirs = libpaths(['/deadir/lib'], platform_bits) | ||
| 63 | + default_include_dirs = ['/deaddir/include'] | ||
| 64 | + default_src_dirs = ['.', '/deaddir/src'] | ||
| 65 | |||
| 66 | + default_x11_lib_dirs = libpaths(['/deaddir/lib'], platform_bits) | ||
| 67 | + default_x11_include_dirs = ['/deaddir/include'] | ||
| 68 | |||
| 69 | if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: | ||
| 70 | default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) | ||
diff --git a/meta-python/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch b/meta-python/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch deleted file mode 100644 index 9da6a2b3da..0000000000 --- a/meta-python/recipes-devtools/python-numpy/files/0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch +++ /dev/null | |||
| @@ -1,32 +0,0 @@ | |||
| 1 | From b881e0b2ba9cf1a4aa351a1c1ea90b1e1776ce21 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 3 | Date: Mon, 12 Aug 2019 15:37:36 +0200 | ||
| 4 | Subject: [PATCH] numpy/random/setup.py: remove the detection of x86 targets | ||
| 5 | via uname() | ||
| 6 | |||
| 7 | This was badly breaking compilation for ARM targets (and possibly | ||
| 8 | other non-x86 targets); if -msse2 is desirable for x86 builds it has | ||
| 9 | to be passed through another channel. | ||
| 10 | |||
| 11 | Upstream-Status: Inappropriate [oe-core specific] | ||
| 12 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
| 13 | --- | ||
| 14 | numpy/random/setup.py | 5 ----- | ||
| 15 | 1 file changed, 5 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/numpy/random/setup.py b/numpy/random/setup.py | ||
| 18 | index 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(arch in platform.machine() | ||
| 26 | - for arch 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-python/recipes-devtools/python-numpy/python-numpy.inc b/meta-python/recipes-devtools/python-numpy/python-numpy.inc deleted file mode 100644 index 8413434af9..0000000000 --- a/meta-python/recipes-devtools/python-numpy/python-numpy.inc +++ /dev/null | |||
| @@ -1,52 +0,0 @@ | |||
| 1 | SUMMARY = "A sophisticated Numeric Processing Package for Python" | ||
| 2 | SECTION = "devel/python" | ||
| 3 | LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1" | ||
| 5 | |||
| 6 | SRCNAME = "numpy" | ||
| 7 | |||
| 8 | SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ | ||
| 9 | file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ | ||
| 10 | file://0001-numpy-random-setup.py-remove-the-detection-of-x86-ta.patch \ | ||
| 11 | " | ||
| 12 | SRC_URI[md5sum] = "9147c3ee75e58d657b5b8b5a4f3564e0" | ||
| 13 | SRC_URI[sha256sum] = "fb0415475e673cb9a6dd816df999e0ab9f86fa3af2b1770944e7288d2bea4ac9" | ||
| 14 | |||
| 15 | UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" | ||
| 16 | UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" | ||
| 17 | |||
| 18 | # Needed for building with gcc 4.x from centos 7 | ||
| 19 | CFLAGS_append_class-native = " -std=c99" | ||
| 20 | |||
| 21 | S = "${WORKDIR}/numpy-${PV}" | ||
| 22 | |||
| 23 | CLEANBROKEN = "1" | ||
| 24 | |||
| 25 | FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/numpy/core/lib/*.a" | ||
| 26 | |||
| 27 | # install what is needed for numpy.test() | ||
| 28 | RDEPENDS_${PN} = "${PYTHON_PN}-unittest \ | ||
| 29 | ${PYTHON_PN}-difflib \ | ||
| 30 | ${PYTHON_PN}-pprint \ | ||
| 31 | ${PYTHON_PN}-pickle \ | ||
| 32 | ${PYTHON_PN}-shell \ | ||
| 33 | ${PYTHON_PN}-nose \ | ||
| 34 | ${PYTHON_PN}-doctest \ | ||
| 35 | ${PYTHON_PN}-datetime \ | ||
| 36 | ${PYTHON_PN}-distutils \ | ||
| 37 | ${PYTHON_PN}-misc \ | ||
| 38 | ${PYTHON_PN}-mmap \ | ||
| 39 | ${PYTHON_PN}-netclient \ | ||
| 40 | ${PYTHON_PN}-numbers \ | ||
| 41 | ${PYTHON_PN}-pydoc \ | ||
| 42 | ${PYTHON_PN}-pkgutil \ | ||
| 43 | ${PYTHON_PN}-email \ | ||
| 44 | ${PYTHON_PN}-compression \ | ||
| 45 | ${PYTHON_PN}-ctypes \ | ||
| 46 | ${PYTHON_PN}-threading \ | ||
| 47 | ${PYTHON_PN}-multiprocessing \ | ||
| 48 | " | ||
| 49 | |||
| 50 | RDEPENDS_${PN}_class-native = "" | ||
| 51 | |||
| 52 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta-python/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb b/meta-python/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb deleted file mode 100644 index d388e88d25..0000000000 --- a/meta-python/recipes-devtools/python-numpy/python3-numpy_1.17.4.bb +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | inherit setuptools3 | ||
| 2 | require python-numpy.inc | ||
| 3 | |||
