From 90e271e9f1c1ecdb205bca3c9b4976a1a16e83b1 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 15 Apr 2019 12:54:57 +0200 Subject: python-numpy: update to 1.16.2 Drop files/fix_shebang_f2py.patch as the code has been removed upstream. License-update: copyright years, file paths. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...h-usr-and-so-on-for-libraries-by-default-.patch | 16 ++++++------ .../files/0001-npy_cpu-Add-riscv-support.patch | 14 ++++------- .../python-numpy/files/fix_shebang_f2py.patch | 29 ---------------------- .../recipes-devtools/python-numpy/python-numpy.inc | 10 ++++---- .../python-numpy/python-numpy_1.14.5.bb | 6 ----- .../python-numpy/python-numpy_1.16.2.bb | 6 +++++ .../python-numpy/python3-numpy_1.14.5.bb | 2 -- .../python-numpy/python3-numpy_1.16.2.bb | 3 +++ 8 files changed, 26 insertions(+), 60 deletions(-) delete mode 100644 meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch delete mode 100644 meta/recipes-devtools/python-numpy/python-numpy_1.14.5.bb create mode 100644 meta/recipes-devtools/python-numpy/python-numpy_1.16.2.bb delete mode 100644 meta/recipes-devtools/python-numpy/python3-numpy_1.14.5.bb create mode 100644 meta/recipes-devtools/python-numpy/python3-numpy_1.16.2.bb 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 516ccd7b9b..8fe0d1a27e 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 @@ -1,7 +1,8 @@ -From c8c6649b29a08f82e1d6761a6d62ce5f632313c5 Mon Sep 17 00:00:00 2001 +From c14554c7e2fff8dd559dfb41e7dd11392c6f85e3 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 10 Dec 2015 13:20:30 +0200 -Subject: [PATCH 1/3] 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 + avoid host contamination. Upstream-Status: Inappropriate (As the code stands, this is a hack) @@ -9,16 +10,16 @@ Signed-off-by: Ross Burton Signed-off-by: Alexander Kanavin --- - numpy/distutils/system_info.py | 50 +++++------------------------------------- + numpy/distutils/system_info.py | 50 ++++------------------------------ 1 file changed, 6 insertions(+), 44 deletions(-) diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py -index bea120c..544e056 100644 +index 2424943..bf56a6d 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py -@@ -262,51 +262,13 @@ if sys.platform == 'win32': +@@ -274,51 +274,13 @@ if sys.platform == 'win32': 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) @@ -74,6 +75,3 @@ index bea120c..544e056 100644 if os.path.join(sys.prefix, 'lib') not in default_lib_dirs: default_lib_dirs.insert(0, os.path.join(sys.prefix, 'lib')) --- -2.16.1 - diff --git a/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch b/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch index 4f5c4f5f0d..4decfe66ee 100644 --- a/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch +++ b/meta/recipes-devtools/python-numpy/files/0001-npy_cpu-Add-riscv-support.patch @@ -1,21 +1,20 @@ -From 30fb1bf9244bb0789c02ec7c98a923acc7200206 Mon Sep 17 00:00:00 2001 +From 629891f67601275c9c4de0bb01afcf1a8c44fa3f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 16 Mar 2018 19:55:21 -0700 Subject: [PATCH] npy_cpu: Add riscv support Signed-off-by: Khem Raj ---- Upstream-Status: Submitted [https://github.com/numpy/numpy/pull/10761] - +--- numpy/core/include/numpy/npy_cpu.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/numpy/core/include/numpy/npy_cpu.h b/numpy/core/include/numpy/npy_cpu.h -index 84653ea18..9e88db873 100644 +index 5edd8f4..e1e4796 100644 --- a/numpy/core/include/numpy/npy_cpu.h +++ b/numpy/core/include/numpy/npy_cpu.h -@@ -78,6 +78,8 @@ - #define NPY_CPU_AARCH64 +@@ -96,6 +96,8 @@ + #define NPY_CPU_OR1K #elif defined(__mc68000__) #define NPY_CPU_M68K +#elif defined(__riscv) @@ -23,6 +22,3 @@ index 84653ea18..9e88db873 100644 #elif defined(__arc__) && defined(__LITTLE_ENDIAN__) #define NPY_CPU_ARCEL #elif defined(__arc__) && defined(__BIG_ENDIAN__) --- -2.16.2 - diff --git a/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch b/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch deleted file mode 100644 index 8be6e4d21f..0000000000 --- a/meta/recipes-devtools/python-numpy/files/fix_shebang_f2py.patch +++ /dev/null @@ -1,29 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -Avoids using python from the HOSTs native sysroot for f2py, -uses TARGET env python instead. - -Signed-off-by: Alejandro Hernandez - -Index: numpy-1.11.0/numpy/f2py/setup.py -=================================================================== ---- numpy-1.11.0.orig/numpy/f2py/setup.py -+++ numpy-1.11.0/numpy/f2py/setup.py -@@ -37,10 +37,13 @@ def _get_f2py_shebang(): - should be ``#!python`` rather than ``#!`` followed by the contents of - ``sys.executable``. - """ -- if set(('bdist_wheel', 'bdist_egg', 'bdist_wininst', -- 'bdist_rpm')).intersection(sys.argv): -- return '#!python' -- return '#!' + sys.executable -+ #if set(('bdist_wheel', 'bdist_egg', 'bdist_wininst', -+ # 'bdist_rpm')).intersection(sys.argv): -+ # return '#!python' -+ #return '#!' + sys.executable -+ -+ # On OE, we need to avoid using the HOSTs python-native, we return env python instead -+ return '#!/usr/bin/env python' - - - def configuration(parent_package='', top_path=None): diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc b/meta/recipes-devtools/python-numpy/python-numpy.inc index 1b51f7baaf..43c8960a18 100644 --- a/meta/recipes-devtools/python-numpy/python-numpy.inc +++ b/meta/recipes-devtools/python-numpy/python-numpy.inc @@ -1,17 +1,17 @@ SUMMARY = "A sophisticated Numeric Processing Package for Python" SECTION = "devel/python" LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=fc53b33304171d132128ebe82ea4a645" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=d26bde5432613cce2334b93985576231" SRCNAME = "numpy" SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${SRCNAME}-${PV}.tar.gz \ file://0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch \ - file://fix_shebang_f2py.patch \ file://0001-npy_cpu-Add-riscv-support.patch \ - ${CONFIGFILESURI} " -SRC_URI[md5sum] = "e3189ee851c3a0e2e6e4c6e80a711ec8" -SRC_URI[sha256sum] = "1b4a02758fb68a65ea986d808867f1d6383219c234aef553a8741818e795b529" + ${CONFIGFILESURI} \ + " +SRC_URI[md5sum] = "4fc754be7ec3e0f80b042d907e99f4ad" +SRC_URI[sha256sum] = "8088221e6e27da8d5907729f0bfe798f526836f22cc59ae83a0f867e67416a3e" UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases" UPSTREAM_CHECK_REGEX = "(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/python-numpy/python-numpy_1.14.5.bb b/meta/recipes-devtools/python-numpy/python-numpy_1.14.5.bb deleted file mode 100644 index 50137895ca..0000000000 --- a/meta/recipes-devtools/python-numpy/python-numpy_1.14.5.bb +++ /dev/null @@ -1,6 +0,0 @@ -inherit setuptools -require python-numpy.inc - -RDEPENDS_${PN}_class-target_append = " \ - ${PYTHON_PN}-subprocess \ -" diff --git a/meta/recipes-devtools/python-numpy/python-numpy_1.16.2.bb b/meta/recipes-devtools/python-numpy/python-numpy_1.16.2.bb new file mode 100644 index 0000000000..50137895ca --- /dev/null +++ b/meta/recipes-devtools/python-numpy/python-numpy_1.16.2.bb @@ -0,0 +1,6 @@ +inherit setuptools +require python-numpy.inc + +RDEPENDS_${PN}_class-target_append = " \ + ${PYTHON_PN}-subprocess \ +" diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.14.5.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.14.5.bb deleted file mode 100644 index 915e6f8c2b..0000000000 --- a/meta/recipes-devtools/python-numpy/python3-numpy_1.14.5.bb +++ /dev/null @@ -1,2 +0,0 @@ -inherit setuptools3 -require python-numpy.inc diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.16.2.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.16.2.bb new file mode 100644 index 0000000000..d388e88d25 --- /dev/null +++ b/meta/recipes-devtools/python-numpy/python3-numpy_1.16.2.bb @@ -0,0 +1,3 @@ +inherit setuptools3 +require python-numpy.inc + -- cgit 1.2.3-korg