[PATCH 1/7] gcc-cross-canadian: add missing runtime dependencies

[PATCH 1/7] gcc-cross-canadian: add missing runtime dependencies

[Alexander Kanavin]

The recipe is special in that it does not auto-detect them
at packaging step (via EXCLUDE_FROM_SHLIBS). With the recursive
RDEPENDS qa check gone they need to be listed explicitly.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
index 807e47e0ee2..44d8ea87be1 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
@@ -152,7 +152,7 @@ do_install () {
 
 ELFUTILS = "nativesdk-elfutils"
 DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib"
-RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}"
+RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-glibc nativesdk-libgcc nativesdk-libstdc++ nativesdk-zlib nativesdk-gmp"
 
 SYSTEMHEADERS = "${target_includedir}/"
 SYSTEMLIBS = "${target_base_libdir}/"
-- 
2.17.1

[PATCH 2/7] insane.bbclass: in file-rdeps do not look into RDEPENDS recursively

[Alexander Kanavin]

Recursive RDEPENDS resolution requires that all of the dependent
recipes' packaging has completed. There is no mechanism to ensure that
and therefore races were observed.

This change effectively requires recipes to list their runtime file
dependencies explicitly rather than have them pulled indirectly.
This may require a bit of fixing in layers, but should result
in a better definition of runtime file dependencies.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/classes/insane.bbclass | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 35c4fdb4913..9b886d13805 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -722,25 +722,7 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, taskdeps, packages, d):
                             filerdepends[subkey] = key[13:]
 
             if filerdepends:
-                next = rdepends
                 done = rdepends[:]
-                # Find all the rdepends on the dependency chain
-                while next:
-                    new = []
-                    for rdep in next:
-                        rdep_data = oe.packagedata.read_subpkgdata(rdep, d)
-                        sub_rdeps = rdep_data.get("RDEPENDS_" + rdep)
-                        if not sub_rdeps:
-                            continue
-                        for sub_rdep in bb.utils.explode_deps(sub_rdeps):
-                            if sub_rdep in done:
-                                continue
-                            if oe.packagedata.has_subpkgdata(sub_rdep, d):
-                                # It's a new rdep
-                                done.append(sub_rdep)
-                                new.append(sub_rdep)
-                    next = new
-
                 # Add the rprovides of itself
                 if pkg not in done:
                     done.insert(0, pkg)
-- 
2.17.1

[PATCH 3/7] maintainers.inc: give python recipes to Oleksandr Kravchuk

[Alexander Kanavin]

Derek Straka has been inactive for about a year; Oleksandr
has been the de facto maintainer meanwhile.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/conf/distro/include/maintainers.inc | 60 ++++++++++++------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 4c4446b3b63..5cf9c7a8e80 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -585,38 +585,38 @@ RECIPE_MAINTAINER_pn-ptest-runner = "Ross Burton <ross.burton@intel.com>"
 RECIPE_MAINTAINER_pn-pulseaudio = "Tanu Kaskinen <tanuk@iki.fi>"
 RECIPE_MAINTAINER_pn-pulseaudio-client-conf-sato = "Tanu Kaskinen <tanuk@iki.fi>"
 RECIPE_MAINTAINER_pn-puzzles = "Anuj Mittal <anuj.mittal@intel.com>"
-RECIPE_MAINTAINER_pn-python = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python-native = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python-nose = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python-numpy = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python-scons = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python-scons-native = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python-setuptools = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3 = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-async = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-dbus = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-docutils = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-extras = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-file-utils = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-git = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-gitdb = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-iniparse = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-mako = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-native = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-nose = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-numpy = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-pbr = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-pip = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-pycairo = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-pygments = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-pygobject = "Derek Straka <derek@asterius.io>"
+RECIPE_MAINTAINER_pn-python = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python-native = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python-nose = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python-numpy = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python-scons = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python-scons-native = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python-setuptools = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3 = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-async = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-dbus = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-docutils = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-extras = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-file-utils = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-git = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-gitdb = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-iniparse = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-mako = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-native = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-nose = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-numpy = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-pbr = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-pip = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-pycairo = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-pygments = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-pygobject = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python3-scons = "Tim Orling <timothy.t.orling@linux.intel.com>"
 RECIPE_MAINTAINER_pn-python3-scons-native = "Tim Orling <timothy.t.orling@linux.intel.com>"
-RECIPE_MAINTAINER_pn-python3-setuptools = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-six = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-smmap = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-subunit = "Derek Straka <derek@asterius.io>"
-RECIPE_MAINTAINER_pn-python3-testtools = "Derek Straka <derek@asterius.io>"
+RECIPE_MAINTAINER_pn-python3-setuptools = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-six = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-smmap = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-subunit = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
+RECIPE_MAINTAINER_pn-python3-testtools = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-qemu = "Richard Purdie <richard.purdie@linuxfoundation.org>"
 RECIPE_MAINTAINER_pn-qemu-helper-native = "Richard Purdie <richard.purdie@linuxfoundation.org>"
 RECIPE_MAINTAINER_pn-qemu-native = "Richard Purdie <richard.purdie@linuxfoundation.org>"
-- 
2.17.1

[PATCH 4/7] python-numpy: remove the python 2.x version of the recipe

[Alexander Kanavin]

The 1.17.0 release of NumPy no longer supports Python 2.x.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/conf/distro/include/maintainers.inc               |  1 -
 .../python-numpy/python-numpy_1.16.3.bb                | 10 ----------
 2 files changed, 11 deletions(-)
 delete mode 100644 meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb

diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 5cf9c7a8e80..c713c811ffa 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -588,7 +588,6 @@ RECIPE_MAINTAINER_pn-puzzles = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER_pn-python = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python-native = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python-nose = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
-RECIPE_MAINTAINER_pn-python-numpy = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python-scons = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python-scons-native = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python-setuptools = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
diff --git a/meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb b/meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb
deleted file mode 100644
index a1133dad41c..00000000000
--- a/meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-inherit setuptools
-require python-numpy.inc
-
-RDEPENDS_${PN}_class-target_append = " \
-    ${PYTHON_PN}-subprocess \
-"
-
-do_install_append(){
-        rm ${D}/${bindir}/f2py
-}
-- 
2.17.1

[PATCH 5/7] python3-numpy: update to 1.17.0

[Alexander Kanavin]

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)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 ...-and-so-on-for-libraries-by-default-.patch | 47 ++++++++-----------
 .../python-numpy/python-numpy.inc             |  8 ++--
 ...umpy_1.16.3.bb => python3-numpy_1.17.0.bb} |  0
 3 files changed, 24 insertions(+), 31 deletions(-)
 rename meta/recipes-devtools/python-numpy/{python3-numpy_1.16.3.bb => python3-numpy_1.17.0.bb} (100%)

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 8fe0d1a27ee..98a97058312 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,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>
 Date: Thu, 10 Dec 2015 13:20:30 +0200
 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>
 
 ---
- numpy/distutils/system_info.py | 50 ++++------------------------------
- 1 file changed, 6 insertions(+), 44 deletions(-)
+ numpy/distutils/system_info.py | 42 ++++------------------------------
+ 1 file changed, 5 insertions(+), 37 deletions(-)
 
 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
 +++ 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'))
  
  else:
@@ -45,31 +45,24 @@ index 2424943..bf56a6d 100644
 -            default_x11_include_dirs.extend(['/usr/lib/X11/include',
 -                                             '/usr/include/X11'])
 -
--    import subprocess as sp
--    tmp = None
--    try:
--        # Explicitly open/close file to avoid ResourceWarning when
--        # tests are run in debug mode Python 3.
--        tmp = open(os.devnull, 'w')
--        p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.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)]
--    finally:
--        if tmp is not None:
--            tmp.close()
+-    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']
  
diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc b/meta/recipes-devtools/python-numpy/python-numpy.inc
index 43c3053cd88..c5d2a15ff21 100644
--- a/meta/recipes-devtools/python-numpy/python-numpy.inc
+++ b/meta/recipes-devtools/python-numpy/python-numpy.inc
@@ -1,7 +1,7 @@
 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=d26bde5432613cce2334b93985576231"
+LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1"
 
 SRCNAME = "numpy"
 
@@ -10,8 +10,8 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S
            file://0001-npy_cpu-Add-riscv-support.patch \
            ${CONFIGFILESURI} \
            "
-SRC_URI[md5sum] = "0886e5b5017f08f2b7a624c0b5931e61"
-SRC_URI[sha256sum] = "adf063a3f87ab89393f5eea0eb903293b112fa0a308e8c594a75ffa585d81d4f"
+SRC_URI[md5sum] = "c48b2ad785f82cdfe28c907ce35e2a71"
+SRC_URI[sha256sum] = "47b7b6145e7ba5918ce26be25999b6d4b35cf9fbfdf46b7da50090ffdb020445"
 
 UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb
similarity index 100%
rename from meta/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb
rename to meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb
-- 
2.17.1

[PATCH 6/7] python-scons: remove the python 2.x version of the recipe

[Alexander Kanavin]

Nothing in oe-core or meta-oe is using it (scons.bbclass is set
to use 3.x version).

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/conf/distro/include/maintainers.inc      |  2 --
 .../python/python-scons-native_3.1.0.bb       |  8 -------
 .../python/python-scons_3.1.0.bb              | 24 -------------------
 3 files changed, 34 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python-scons-native_3.1.0.bb
 delete mode 100644 meta/recipes-devtools/python/python-scons_3.1.0.bb

diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index c713c811ffa..08fd83d3c4e 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -588,8 +588,6 @@ RECIPE_MAINTAINER_pn-puzzles = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER_pn-python = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python-native = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python-nose = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
-RECIPE_MAINTAINER_pn-python-scons = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
-RECIPE_MAINTAINER_pn-python-scons-native = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python-setuptools = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python3 = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python3-async = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
diff --git a/meta/recipes-devtools/python/python-scons-native_3.1.0.bb b/meta/recipes-devtools/python/python-scons-native_3.1.0.bb
deleted file mode 100644
index 68b63c93579..00000000000
--- a/meta/recipes-devtools/python/python-scons-native_3.1.0.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require python-scons_${PV}.bb
-inherit native pythonnative
-DEPENDS = "python-native"
-RDEPENDS_${PN} = ""
-
-do_install_append() {
-    create_wrapper ${D}${bindir}/scons SCONS_LIB_DIR='${STAGING_DIR_HOST}/${PYTHON_SITEPACKAGES_DIR}' PYTHONNOUSERSITE='1'
-}
diff --git a/meta/recipes-devtools/python/python-scons_3.1.0.bb b/meta/recipes-devtools/python/python-scons_3.1.0.bb
deleted file mode 100644
index b174050583f..00000000000
--- a/meta/recipes-devtools/python/python-scons_3.1.0.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-SUMMARY = "Software Construction tool (make/autotools replacement)"
-SECTION = "devel/python"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=37bb53a08e6beaea0c90e7821d731284"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz"
-SRC_URI[md5sum] = "e2fe9d16f81b0285b969238af4b552ff"
-SRC_URI[sha256sum] = "f3f548d738d4a2179123ecd744271ec413b2d55735ea7625a59b1b59e6cd132f"
-
-S = "${WORKDIR}/scons-${PV}"
-
-UPSTREAM_CHECK_URI = "http://scons.org/pages/download.html"
-UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
-
-inherit setuptools
-
-RDEPENDS_${PN} = "\
-  python-fcntl \
-  python-io \
-  python-json \
-  python-subprocess \
-  python-shell \
-  python-pprint \
-  "
-- 
2.17.1

[PATCH 7/7] python-nose: remove the python 2.x version of the recipe

[Alexander Kanavin]

With removal of python 2.x numpy, nothing needs it anymore.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/conf/distro/include/maintainers.inc          | 1 -
 meta/recipes-devtools/python/python-nose_1.3.7.bb | 6 ------
 2 files changed, 7 deletions(-)
 delete mode 100644 meta/recipes-devtools/python/python-nose_1.3.7.bb

diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 08fd83d3c4e..a595507948b 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -587,7 +587,6 @@ RECIPE_MAINTAINER_pn-pulseaudio-client-conf-sato = "Tanu Kaskinen <tanuk@iki.fi>
 RECIPE_MAINTAINER_pn-puzzles = "Anuj Mittal <anuj.mittal@intel.com>"
 RECIPE_MAINTAINER_pn-python = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python-native = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
-RECIPE_MAINTAINER_pn-python-nose = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python-setuptools = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python3 = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
 RECIPE_MAINTAINER_pn-python3-async = "Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com>"
diff --git a/meta/recipes-devtools/python/python-nose_1.3.7.bb b/meta/recipes-devtools/python/python-nose_1.3.7.bb
deleted file mode 100644
index fab609df901..00000000000
--- a/meta/recipes-devtools/python/python-nose_1.3.7.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-inherit setuptools
-require python-nose.inc
-
-do_install_append() {
-    rm ${D}${bindir}/nosetests
-}
-- 
2.17.1

Re: [PATCH 1/7] gcc-cross-canadian: add missing runtime dependencies

[Richard Purdie]

On Thu, 2019-08-08 at 18:11 +0200, Alexander Kanavin wrote:
> The recipe is special in that it does not auto-detect them
> at packaging step (via EXCLUDE_FROM_SHLIBS). With the recursive
> RDEPENDS qa check gone they need to be listed explicitly.
> 
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> index 807e47e0ee2..44d8ea87be1 100644
> --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> @@ -152,7 +152,7 @@ do_install () {
>  
>  ELFUTILS = "nativesdk-elfutils"
>  DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib"
> -RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}"
> +RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-glibc nativesdk-libgcc nativesdk-libstdc++ nativesdk-zlib nativesdk-gmp"
>  
>  SYSTEMHEADERS = "${target_includedir}/"
>  SYSTEMLIBS = "${target_base_libdir}/"

This unfortunately breaks mingw:

https://autobuilder.yoctoproject.org/typhoon/#/builders/89/builds/908

I'm kind of curious why we can't use shlibs but I'm also not sure I
want to know :/

Cheers,

Richard

Re: [PATCH 5/7] python3-numpy: update to 1.17.0

[Khem Raj]

https://errors.yoctoproject.org/Errors/Details/260208/

On Thu, Aug 8, 2019 at 9:12 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote:
>
> 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)
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  ...-and-so-on-for-libraries-by-default-.patch | 47 ++++++++-----------
>  .../python-numpy/python-numpy.inc             |  8 ++--
>  ...umpy_1.16.3.bb => python3-numpy_1.17.0.bb} |  0
>  3 files changed, 24 insertions(+), 31 deletions(-)
>  rename meta/recipes-devtools/python-numpy/{python3-numpy_1.16.3.bb => python3-numpy_1.17.0.bb} (100%)
>
> 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 8fe0d1a27ee..98a97058312 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,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>
>  Date: Thu, 10 Dec 2015 13:20:30 +0200
>  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>
>
>  ---
> - numpy/distutils/system_info.py | 50 ++++------------------------------
> - 1 file changed, 6 insertions(+), 44 deletions(-)
> + numpy/distutils/system_info.py | 42 ++++------------------------------
> + 1 file changed, 5 insertions(+), 37 deletions(-)
>
>  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
>  +++ 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'))
>
>   else:
> @@ -45,31 +45,24 @@ index 2424943..bf56a6d 100644
>  -            default_x11_include_dirs.extend(['/usr/lib/X11/include',
>  -                                             '/usr/include/X11'])
>  -
> --    import subprocess as sp
> --    tmp = None
> --    try:
> --        # Explicitly open/close file to avoid ResourceWarning when
> --        # tests are run in debug mode Python 3.
> --        tmp = open(os.devnull, 'w')
> --        p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.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)]
> --    finally:
> --        if tmp is not None:
> --            tmp.close()
> +-    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']
>
> diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc b/meta/recipes-devtools/python-numpy/python-numpy.inc
> index 43c3053cd88..c5d2a15ff21 100644
> --- a/meta/recipes-devtools/python-numpy/python-numpy.inc
> +++ b/meta/recipes-devtools/python-numpy/python-numpy.inc
> @@ -1,7 +1,7 @@
>  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=d26bde5432613cce2334b93985576231"
> +LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT"
> +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1"
>
>  SRCNAME = "numpy"
>
> @@ -10,8 +10,8 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S
>             file://0001-npy_cpu-Add-riscv-support.patch \
>             ${CONFIGFILESURI} \
>             "
> -SRC_URI[md5sum] = "0886e5b5017f08f2b7a624c0b5931e61"
> -SRC_URI[sha256sum] = "adf063a3f87ab89393f5eea0eb903293b112fa0a308e8c594a75ffa585d81d4f"
> +SRC_URI[md5sum] = "c48b2ad785f82cdfe28c907ce35e2a71"
> +SRC_URI[sha256sum] = "47b7b6145e7ba5918ce26be25999b6d4b35cf9fbfdf46b7da50090ffdb020445"
>
>  UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
>  UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
> diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb
> similarity index 100%
> rename from meta/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb
> rename to meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 5/7] python3-numpy: update to 1.17.0

[Khem Raj]

Fails same way on qemuarm/glibc

https://errors.yoctoproject.org/Errors/Details/260792/

On Fri, Aug 9, 2019 at 11:11 AM Khem Raj <raj.khem@gmail.com> wrote:
>
> https://errors.yoctoproject.org/Errors/Details/260208/
>
> On Thu, Aug 8, 2019 at 9:12 AM Alexander Kanavin <alex.kanavin@gmail.com> wrote:
> >
> > 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)
> > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > ---
> >  ...-and-so-on-for-libraries-by-default-.patch | 47 ++++++++-----------
> >  .../python-numpy/python-numpy.inc             |  8 ++--
> >  ...umpy_1.16.3.bb => python3-numpy_1.17.0.bb} |  0
> >  3 files changed, 24 insertions(+), 31 deletions(-)
> >  rename meta/recipes-devtools/python-numpy/{python3-numpy_1.16.3.bb => python3-numpy_1.17.0.bb} (100%)
> >
> > 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 8fe0d1a27ee..98a97058312 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,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>
> >  Date: Thu, 10 Dec 2015 13:20:30 +0200
> >  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>
> >
> >  ---
> > - numpy/distutils/system_info.py | 50 ++++------------------------------
> > - 1 file changed, 6 insertions(+), 44 deletions(-)
> > + numpy/distutils/system_info.py | 42 ++++------------------------------
> > + 1 file changed, 5 insertions(+), 37 deletions(-)
> >
> >  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
> >  +++ 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'))
> >
> >   else:
> > @@ -45,31 +45,24 @@ index 2424943..bf56a6d 100644
> >  -            default_x11_include_dirs.extend(['/usr/lib/X11/include',
> >  -                                             '/usr/include/X11'])
> >  -
> > --    import subprocess as sp
> > --    tmp = None
> > --    try:
> > --        # Explicitly open/close file to avoid ResourceWarning when
> > --        # tests are run in debug mode Python 3.
> > --        tmp = open(os.devnull, 'w')
> > --        p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.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)]
> > --    finally:
> > --        if tmp is not None:
> > --            tmp.close()
> > +-    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']
> >
> > diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc b/meta/recipes-devtools/python-numpy/python-numpy.inc
> > index 43c3053cd88..c5d2a15ff21 100644
> > --- a/meta/recipes-devtools/python-numpy/python-numpy.inc
> > +++ b/meta/recipes-devtools/python-numpy/python-numpy.inc
> > @@ -1,7 +1,7 @@
> >  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=d26bde5432613cce2334b93985576231"
> > +LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT"
> > +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1"
> >
> >  SRCNAME = "numpy"
> >
> > @@ -10,8 +10,8 @@ SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S
> >             file://0001-npy_cpu-Add-riscv-support.patch \
> >             ${CONFIGFILESURI} \
> >             "
> > -SRC_URI[md5sum] = "0886e5b5017f08f2b7a624c0b5931e61"
> > -SRC_URI[sha256sum] = "adf063a3f87ab89393f5eea0eb903293b112fa0a308e8c594a75ffa585d81d4f"
> > +SRC_URI[md5sum] = "c48b2ad785f82cdfe28c907ce35e2a71"
> > +SRC_URI[sha256sum] = "47b7b6145e7ba5918ce26be25999b6d4b35cf9fbfdf46b7da50090ffdb020445"
> >
> >  UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
> >  UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
> > diff --git a/meta/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb b/meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb
> > similarity index 100%
> > rename from meta/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb
> > rename to meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb
> > --
> > 2.17.1
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 5/7] python3-numpy: update to 1.17.0

[Alexander Kanavin]

[-- Attachment #1: Type: text/plain, Size: 7508 bytes --]

Thanks, I have resent the patchset with the fix included.

Alex

On Mon, 12 Aug 2019 at 04:59, Khem Raj <raj.khem@gmail.com> wrote:

> Fails same way on qemuarm/glibc
>
> https://errors.yoctoproject.org/Errors/Details/260792/
>
> On Fri, Aug 9, 2019 at 11:11 AM Khem Raj <raj.khem@gmail.com> wrote:
> >
> > https://errors.yoctoproject.org/Errors/Details/260208/
> >
> > On Thu, Aug 8, 2019 at 9:12 AM Alexander Kanavin <alex.kanavin@gmail.com>
> wrote:
> > >
> > > 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)
> > > Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > > ---
> > >  ...-and-so-on-for-libraries-by-default-.patch | 47 ++++++++-----------
> > >  .../python-numpy/python-numpy.inc             |  8 ++--
> > >  ...umpy_1.16.3.bb => python3-numpy_1.17.0.bb} |  0
> > >  3 files changed, 24 insertions(+), 31 deletions(-)
> > >  rename meta/recipes-devtools/python-numpy/{python3-numpy_1.16.3.bb
> => python3-numpy_1.17.0.bb} (100%)
> > >
> > > 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 8fe0d1a27ee..98a97058312 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,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>
> > >  Date: Thu, 10 Dec 2015 13:20:30 +0200
> > >  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>
> > >
> > >  ---
> > > - numpy/distutils/system_info.py | 50
> ++++------------------------------
> > > - 1 file changed, 6 insertions(+), 44 deletions(-)
> > > + numpy/distutils/system_info.py | 42
> ++++------------------------------
> > > + 1 file changed, 5 insertions(+), 37 deletions(-)
> > >
> > >  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
> > >  +++ 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'))
> > >
> > >   else:
> > > @@ -45,31 +45,24 @@ index 2424943..bf56a6d 100644
> > >  -            default_x11_include_dirs.extend(['/usr/lib/X11/include',
> > >  -                                             '/usr/include/X11'])
> > >  -
> > > --    import subprocess as sp
> > > --    tmp = None
> > > --    try:
> > > --        # Explicitly open/close file to avoid ResourceWarning when
> > > --        # tests are run in debug mode Python 3.
> > > --        tmp = open(os.devnull, 'w')
> > > --        p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.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)]
> > > --    finally:
> > > --        if tmp is not None:
> > > --            tmp.close()
> > > +-    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']
> > >
> > > diff --git a/meta/recipes-devtools/python-numpy/python-numpy.inc
> b/meta/recipes-devtools/python-numpy/python-numpy.inc
> > > index 43c3053cd88..c5d2a15ff21 100644
> > > --- a/meta/recipes-devtools/python-numpy/python-numpy.inc
> > > +++ b/meta/recipes-devtools/python-numpy/python-numpy.inc
> > > @@ -1,7 +1,7 @@
> > >  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=d26bde5432613cce2334b93985576231"
> > > +LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT"
> > > +LIC_FILES_CHKSUM =
> "file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1"
> > >
> > >  SRCNAME = "numpy"
> > >
> > > @@ -10,8 +10,8 @@ SRC_URI = "
> https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S
> > >             file://0001-npy_cpu-Add-riscv-support.patch \
> > >             ${CONFIGFILESURI} \
> > >             "
> > > -SRC_URI[md5sum] = "0886e5b5017f08f2b7a624c0b5931e61"
> > > -SRC_URI[sha256sum] =
> "adf063a3f87ab89393f5eea0eb903293b112fa0a308e8c594a75ffa585d81d4f"
> > > +SRC_URI[md5sum] = "c48b2ad785f82cdfe28c907ce35e2a71"
> > > +SRC_URI[sha256sum] =
> "47b7b6145e7ba5918ce26be25999b6d4b35cf9fbfdf46b7da50090ffdb020445"
> > >
> > >  UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
> > >  UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
> > > diff --git a/meta/recipes-devtools/python-numpy/
> python3-numpy_1.16.3.bb b/meta/recipes-devtools/python-numpy/
> python3-numpy_1.17.0.bb
> > > similarity index 100%
> > > rename from meta/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb
> > > rename to meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb
> > > --
> > > 2.17.1
> > >
> > > --
> > > _______________________________________________
> > > Openembedded-core mailing list
> > > Openembedded-core@lists.openembedded.org
> > > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 11054 bytes --]