Thanks, I have resent the patchset with the fix included. Alex
On Mon, 12 Aug 2019 at 04:59, Khem Raj <[email protected]> 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 <[email protected]> wrote: > > > > https://errors.yoctoproject.org/Errors/Details/260208/ > > > > On Thu, Aug 8, 2019 at 9:12 AM Alexander Kanavin <[email protected]> > 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 <[email protected]> > > > --- > > > ...-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 <[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'] > > > > > > 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 > > > [email protected] > > > http://lists.openembedded.org/mailman/listinfo/openembedded-core >
-- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
