Skip to contentSkip to conversation

gcc-cross-canadian: add missing runtime dependencies

PATCH In review Alexander Kanavin 3 participants 11 messages Aug 8, 2019 – Aug 12, 2019

lore
Share & tools
lore
#0 lore raw

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

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.

---
 meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/gcc/gcc-cross-canadian.inc +1 -1
index 807e47e0ee2..44d8ea87be1 100644
@@ -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}/"
Signature · 1 line
2.17.1
#1 lore raw

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

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.

---
 meta/classes/insane.bbclass | 18 ------------------
 1 file changed, 18 deletions(-)
meta/classes/insane.bbclass +0 -18
index 35c4fdb4913..9b886d13805 100644
@@ -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)
Signature · 1 line
2.17.1
#2 lore raw

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

In reply to Alexander Kanavin

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

---
 meta/conf/distro/include/maintainers.inc | 60 ++++++++++++------------
 1 file changed, 30 insertions(+), 30 deletions(-)
meta/conf/distro/include/maintainers.inc +30 -30
index 4c4446b3b63..5cf9c7a8e80 100644
@@ -585,38 +585,38 @@ RECIPE_MAINTAINER_pn-ptest-runner = "Ross Burton <[email protected]>"
 RECIPE_MAINTAINER_pn-pulseaudio = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-pulseaudio-client-conf-sato = "Tanu Kaskinen <[email protected]>"
 RECIPE_MAINTAINER_pn-puzzles = "Anuj Mittal <[email protected]>"
-RECIPE_MAINTAINER_pn-python = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python-native = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python-nose = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python-numpy = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python-scons = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python-scons-native = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python-setuptools = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3 = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-async = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-dbus = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-docutils = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-extras = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-file-utils = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-git = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-gitdb = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-iniparse = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-mako = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-native = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-nose = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-numpy = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-pbr = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-pip = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-pycairo = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-pygments = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-pygobject = "Derek Straka <[email protected]>"
+RECIPE_MAINTAINER_pn-python = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python-native = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python-nose = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python-numpy = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python-scons = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python-scons-native = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python-setuptools = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3 = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-async = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-dbus = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-docutils = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-extras = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-file-utils = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-git = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-gitdb = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-iniparse = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-mako = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-native = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-nose = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-numpy = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-pbr = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-pip = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-pycairo = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-pygments = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-pygobject = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-scons = "Tim Orling <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-scons-native = "Tim Orling <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-setuptools = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-six = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-smmap = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-subunit = "Derek Straka <[email protected]>"
-RECIPE_MAINTAINER_pn-python3-testtools = "Derek Straka <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-setuptools = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-six = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-smmap = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-subunit = "Oleksandr Kravchuk <[email protected]>"
+RECIPE_MAINTAINER_pn-python3-testtools = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-qemu = "Richard Purdie <[email protected]>"
 RECIPE_MAINTAINER_pn-qemu-helper-native = "Richard Purdie <[email protected]>"
 RECIPE_MAINTAINER_pn-qemu-native = "Richard Purdie <[email protected]>"
Signature · 1 line
2.17.1
#3 lore raw

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

In reply to Alexander Kanavin

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

---
 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
meta/conf/distro/include/maintainers.inc +0 -1
index 5cf9c7a8e80..c713c811ffa 100644
@@ -588,7 +588,6 @@ RECIPE_MAINTAINER_pn-puzzles = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-python = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python-native = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python-nose = "Oleksandr Kravchuk <[email protected]>"
-RECIPE_MAINTAINER_pn-python-numpy = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python-scons = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python-scons-native = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python-setuptools = "Oleksandr Kravchuk <[email protected]>"
meta/recipes-devtools/python-numpy/python-numpy_1.16.3.bb deleted +0 -10
deleted file mode 100644
index a1133dad41c..00000000000
@@ -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
-}
Signature · 1 line
2.17.1
#4 lore raw

PATCH 5/7 python3-numpy: update to 1.17.0

In reply to 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)

---
 ...-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%)
meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +20 -27
index 8fe0d1a27ee..98a97058312 100644
@@ -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 <[email protected]>
 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 <[email protected]>
 Signed-off-by: Alexander Kanavin <[email protected]>
 
 ---
- 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']
  
meta/recipes-devtools/python-numpy/python-numpy.inc +4 -4
index 43c3053cd88..c5d2a15ff21 100644
@@ -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"
meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb renamed from meta/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb +0 -0
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
Signature · 1 line
2.17.1
#5 lore raw

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

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

Quoted 125 lines · 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)

---
 ...-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%)
meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +20 -27
index 8fe0d1a27ee..98a97058312 100644
@@ -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 <[email protected]>
 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 <[email protected]>
 Signed-off-by: Alexander Kanavin <[email protected]>
 
 ---
- 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']
 
meta/recipes-devtools/python-numpy/python-numpy.inc +4 -4
index 43c3053cd88..c5d2a15ff21 100644
@@ -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"
meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb renamed from meta/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb +0 -1
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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#6 lore raw

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

Fails same way on qemuarm/glibc

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

Quoted 129 lines · Khem Raj

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

Quoted 125 lines · 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)

---
 ...-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%)
meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +20 -27
index 8fe0d1a27ee..98a97058312 100644
@@ -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 <[email protected]>
 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 <[email protected]>
 Signed-off-by: Alexander Kanavin <[email protected]>
 
 ---
- 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']
 
meta/recipes-devtools/python-numpy/python-numpy.inc +4 -4
index 43c3053cd88..c5d2a15ff21 100644
@@ -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"
meta/recipes-devtools/python-numpy/python3-numpy_1.17.0.bb renamed from meta/recipes-devtools/python-numpy/python3-numpy_1.16.3.bb +0 -1
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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#7 lore raw

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

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

Alex

Quoted 163 lines · Khem Raj

Fails same way on qemuarm/glibc

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

Quoted 4 lines · Khem Raj

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

On Thu, Aug 8, 2019 at 9:12 AM Alexander Kanavin <[email protected]>

Quoted 2 lines · wrote:
Quoted 2 lines

Rebase

files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch

Quoted 2 lines
Quoted 2 lines

License-Update: clarified license for

numpy/core/src/multiarray/dragon4.c (it is MIT)

Quoted 7 lines
Quoted 7 lines
---
 ...-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%)

Quoted 2 lines
Quoted 2 lines

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

Quoted 2 lines
Quoted 2 lines

index 8fe0d1a27ee..98a97058312 100644
---

a/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch

Quoted 1 line
Quoted 1 line

+++

b/meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch

Quoted 6 lines

meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch line 4

Quoted 6 lines
meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +1 -1
@@ -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 <[email protected]>
 Date: Thu, 10 Dec 2015 13:20:30 +0200
 Subject: [PATCH] Don't search /usr and so on for libraries by default

to

Quoted 5 lines

meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch Signed-off-by: Ross Burton <[email protected]> · line 13

Quoted 5 lines
meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +0 -1
@@ -10,14 +10,14 @@ Signed-off-by: Ross Burton <[email protected]>
 Signed-off-by: Alexander Kanavin <[email protected]>
 
 ---
- numpy/distutils/system_info.py | 50

++++------------------------------

Quoted 2 lines

Review Signed-off-by: Ross Burton <[email protected]> · line 13

Quoted 2 lines
(quoted diff) +1 -1
- 1 file changed, 6 insertions(+), 44 deletions(-)
+ numpy/distutils/system_info.py | 42

++++------------------------------

Quoted 3 lines

meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch Signed-off-by: Ross Burton <[email protected]>

Quoted 3 lines
meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +1 -0
+ 1 file changed, 5 insertions(+), 37 deletions(-)
 
 diff --git a/numpy/distutils/system_info.py

b/numpy/distutils/system_info.py

Quoted 8 lines
Quoted 8 lines
meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +2 -2
-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'))
 
Quoted 15 lines
Quoted 5 lines
meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +0 -0
  else:
@@ -45,31 +45,24 @@ index 2424943..bf56a6d 100644
 -            default_x11_include_dirs.extend(['/usr/lib/X11/include',
 -                                             '/usr/include/X11'])
 -

meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch index 2424943..bf56a6d 100644 · line 57

Quoted 10 lines
meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +0 -10
--    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

Quoted 1 line

Review index 2424943..bf56a6d 100644 · line 58

Quoted 1 line
(quoted diff) +0 -1
--        # subclass) if an old setuptools bug is triggered (see

gh-3160).

Quoted 6 lines

meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch index 2424943..bf56a6d 100644

Quoted 6 lines
meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +0 -6
--        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)]

Quoted 7 lines

meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch index 2424943..bf56a6d 100644

Quoted 7 lines
meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +3 -4
--            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,

Quoted 3 lines

meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch index 2424943..bf56a6d 100644

Quoted 3 lines
meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +3 -0
+-                         stderr=tmp)
+-        except (OSError, DistutilsError):
+-            # OSError if gcc is not installed, or SandboxViolation

(DistutilsError

Quoted 1 line

Review index 2424943..bf56a6d 100644 · line 54

Quoted 1 line
(quoted diff) +1 -0
+-            # subclass) if an old setuptools bug is triggered (see

gh-3160).

Quoted 6 lines

meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch index 2424943..bf56a6d 100644

Quoted 6 lines
meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +6 -0
+-            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)]

Quoted 1 line

Review index 2424943..bf56a6d 100644 · line 61

Quoted 1 line
(quoted diff) +1 -0
+-                default_lib_dirs += [os.path.join("/usr/lib/",

triplet)]

Quoted 9 lines

Review

Quoted 9 lines
meta/recipes-devtools/python-numpy/files/0001-Don-t-search-usr-and-so-on-for-libraries-by-default-.patch +1 -1
 +    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']
 
(quoted diff) +0 -0

b/meta/recipes-devtools/python-numpy/python-numpy.inc

Quoted 8 lines

meta/recipes-devtools/python-numpy/python-numpy.inc line 4

Quoted 8 lines

index 43c3053cd88..c5d2a15ff21 100644

meta/recipes-devtools/python-numpy/python-numpy.inc +0 -2
@@ -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"

Quoted 2 lines

meta/recipes-devtools/python-numpy/python-numpy.inc line 4

Quoted 2 lines
meta/recipes-devtools/python-numpy/python-numpy.inc +2 -0
+LICENSE = "BSD-3-Clause & BSD-2-Clause & PSF & Apache-2.0 & BSD & MIT"
+LIC_FILES_CHKSUM =

"file://LICENSE.txt;md5=1a32aba007a415aa8a1c708a0e2b86a1"

Quoted 4 lines

meta/recipes-devtools/python-numpy/python-numpy.inc SRC_URI = "

Quoted 4 lines
meta/recipes-devtools/python-numpy/python-numpy.inc +0 -0
 SRCNAME = "numpy"
 
@@ -10,8 +10,8 @@ SRC_URI = "

https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S

Quoted 5 lines

meta/recipes-devtools/python-numpy/python-numpy.inc SRC_URI = "https://github.com/${SRCNAME}/${SRCNAME}/releases/download/v${PV}/${S

Quoted 5 lines
meta/recipes-devtools/python-numpy/python-numpy.inc +0 -2
            file://0001-npy_cpu-Add-riscv-support.patch \
            ${CONFIGFILESURI} \
            "
-SRC_URI[md5sum] = "0886e5b5017f08f2b7a624c0b5931e61"
-SRC_URI[sha256sum] =

"adf063a3f87ab89393f5eea0eb903293b112fa0a308e8c594a75ffa585d81d4f"

Quoted 2 lines

meta/recipes-devtools/python-numpy/python-numpy.inc SRC_URI = " · line 14

Quoted 2 lines
meta/recipes-devtools/python-numpy/python-numpy.inc +2 -0
+SRC_URI[md5sum] = "c48b2ad785f82cdfe28c907ce35e2a71"
+SRC_URI[sha256sum] =

"47b7b6145e7ba5918ce26be25999b6d4b35cf9fbfdf46b7da50090ffdb020445"

Quoted 4 lines

Review

Quoted 4 lines
meta/recipes-devtools/python-numpy/python-numpy.inc +0 -0
 UPSTREAM_CHECK_URI = "https://github.com/numpy/numpy/releases"
 UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar"
(quoted diff) +0 -0

python3-numpy_1.16.3.bb b/meta/recipes-devtools/python-numpy/ python3-numpy_1.17.0.bb

Quoted 11 lines
Quoted 11 lines

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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#8 lore raw

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

In reply to Alexander Kanavin

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

---
 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
meta/conf/distro/include/maintainers.inc +0 -2
index c713c811ffa..08fd83d3c4e 100644
@@ -588,8 +588,6 @@ RECIPE_MAINTAINER_pn-puzzles = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-python = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python-native = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python-nose = "Oleksandr Kravchuk <[email protected]>"
-RECIPE_MAINTAINER_pn-python-scons = "Oleksandr Kravchuk <[email protected]>"
-RECIPE_MAINTAINER_pn-python-scons-native = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python-setuptools = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python3 = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-async = "Oleksandr Kravchuk <[email protected]>"
meta/recipes-devtools/python/python-scons-native_3.1.0.bb deleted +0 -8
deleted file mode 100644
index 68b63c93579..00000000000
@@ -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'
-}
meta/recipes-devtools/python/python-scons_3.1.0.bb deleted +0 -24
deleted file mode 100644
index b174050583f..00000000000
@@ -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 \
-  "
Signature · 1 line
2.17.1
#9 lore raw

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

In reply to Alexander Kanavin

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

---
 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
meta/conf/distro/include/maintainers.inc +0 -1
index 08fd83d3c4e..a595507948b 100644
@@ -587,7 +587,6 @@ RECIPE_MAINTAINER_pn-pulseaudio-client-conf-sato = "Tanu Kaskinen <[email protected]>
 RECIPE_MAINTAINER_pn-puzzles = "Anuj Mittal <[email protected]>"
 RECIPE_MAINTAINER_pn-python = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python-native = "Oleksandr Kravchuk <[email protected]>"
-RECIPE_MAINTAINER_pn-python-nose = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python-setuptools = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python3 = "Oleksandr Kravchuk <[email protected]>"
 RECIPE_MAINTAINER_pn-python3-async = "Oleksandr Kravchuk <[email protected]>"
meta/recipes-devtools/python/python-nose_1.3.7.bb deleted +0 -6
deleted file mode 100644
index fab609df901..00000000000
@@ -1,6 +0,0 @@
-inherit setuptools
-require python-nose.inc
-
-do_install_append() {
-    rm ${D}${bindir}/nosetests
-}
Signature · 1 line
2.17.1
#10 lore raw
In reply to Alexander Kanavin
Quoted 14 lines · 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.

---
 meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/gcc/gcc-cross-canadian.inc +0 -0
index 807e47e0ee2..44d8ea87be1 100644

meta/recipes-devtools/gcc/gcc-cross-canadian.inc do_install () { · line 158

Quoted 8 lines
meta/recipes-devtools/gcc/gcc-cross-canadian.inc +1 -1
@@ -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