All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/5] meson: update 0.52.1 -> 0.53.0
@ 2020-01-23 17:34 Alexander Kanavin
  2020-01-23 17:34 ` [PATCH 2/5] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
                   ` (4 more replies)
  0 siblings, 5 replies; 12+ messages in thread
From: Alexander Kanavin @ 2020-01-23 17:34 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/classes/meson.bbclass                       |  9 ++++++++-
 meta/recipes-devtools/meson/meson.inc            |  4 ++--
 .../0001-Make-CPU-family-warnings-fatal.patch    | 12 ++++++------
 ...-do-not-manipulate-the-environment-when.patch | 16 ++++++++--------
 ...-Support-building-allarch-recipes-again.patch |  6 +++---
 .../meson/meson/0003-native_bindir.patch         | 16 ++++++++--------
 .../meson/{meson_0.52.1.bb => meson_0.53.0.bb}   |  0
 ...meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} |  2 +-
 8 files changed, 36 insertions(+), 29 deletions(-)
 rename meta/recipes-devtools/meson/{meson_0.52.1.bb => meson_0.53.0.bb} (100%)
 rename meta/recipes-devtools/meson/{nativesdk-meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} (99%)

diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
index 1ef34a999c8..1837c9468e6 100644
--- a/meta/classes/meson.bbclass
+++ b/meta/classes/meson.bbclass
@@ -85,13 +85,16 @@ addtask write_config before do_configure
 do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS CXXFLAGS LDFLAGS"
 do_write_config() {
     # This needs to be Py to split the args into single-element lists
+
+    # Meson requires ld to be 'bfd, 'lld' or 'gold' from 0.53 onwards
+    # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
     cat >${WORKDIR}/meson.cross <<EOF
 [binaries]
 c = ${@meson_array('CC', d)}
 cpp = ${@meson_array('CXX', d)}
 ar = ${@meson_array('AR', d)}
 nm = ${@meson_array('NM', d)}
-ld = ${@meson_array('LD', d)}
+ld = 'bfd'
 strip = ${@meson_array('STRIP', d)}
 readelf = ${@meson_array('READELF', d)}
 pkgconfig = 'pkg-config'
@@ -122,6 +125,10 @@ EOF
 CONFIGURE_FILES = "meson.build"
 
 meson_do_configure() {
+    # Meson requires this to be 'bfd, 'lld' or 'gold' from 0.53 onwards
+    # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
+    unset LD
+
     # Work around "Meson fails if /tmp is mounted with noexec #2972"
     mkdir -p "${B}/meson-private/tmp"
     export TMPDIR="${B}/meson-private/tmp"
diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
index 881a14c7f0a..c0ce7d338bc 100644
--- a/meta/recipes-devtools/meson/meson.inc
+++ b/meta/recipes-devtools/meson/meson.inc
@@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
            file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
            file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
            "
-SRC_URI[sha256sum] = "0c277472e49950a5537e3de3e60c57b80dbf425788470a1a8ed27446128fc035"
-SRC_URI[md5sum] = "a5f0c99567d772508f649a28ded7f8ad"
+SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6"
+SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3"
 
 SRC_URI_append_class-native = " \
     file://0001-Make-CPU-family-warnings-fatal.patch \
diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
index d4264cee526..74d5b4ca66e 100644
--- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
+++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
@@ -1,4 +1,4 @@
-From cd980c763f11cfd928255346cc7e86f24add985e Mon Sep 17 00:00:00 2001
+From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@intel.com>
 Date: Tue, 3 Jul 2018 13:59:09 +0100
 Subject: [PATCH] Make CPU family warnings fatal
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 29d7422..5fb00a4 100644
+index 0f277a7..24578ea 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
-@@ -190,7 +190,7 @@ class MachineInfo:
+@@ -192,7 +192,7 @@ class MachineInfo:
  
          cpu_family = literal['cpu_family']
          if cpu_family not in known_cpu_families:
@@ -25,15 +25,15 @@ index 29d7422..5fb00a4 100644
          endian = literal['endian']
          if endian not in ('little', 'big'):
 diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index a9bc2b8..b91c8da 100644
+index dc8b14f..3aab71e 100644
 --- a/mesonbuild/environment.py
 +++ b/mesonbuild/environment.py
-@@ -348,9 +348,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
+@@ -354,9 +354,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
          trial = 'parisc'
  
      if trial not in known_cpu_families:
 -        mlog.warning('Unknown CPU family {!r}, please report this at '
--                     'https://github.com/mesonbuild/meson/issues/new with the'
+-                     'https://github.com/mesonbuild/meson/issues/new with the '
 -                     'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial))
 +        raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
  
diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
index bf715d1e9f4..eb0e90dbdda 100644
--- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
+++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
@@ -1,4 +1,4 @@
-From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00 2001
+From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <alex.kanavin@gmail.com>
 Date: Mon, 19 Nov 2018 14:24:26 +0100
 Subject: [PATCH] python module: do not manipulate the environment when calling
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
  1 file changed, 12 deletions(-)
 
 diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
-index 9cfbd6f..3ff687a 100644
+index 07be318..b770603 100644
 --- a/mesonbuild/modules/python.py
 +++ b/mesonbuild/modules/python.py
-@@ -75,11 +75,6 @@ class PythonDependency(ExternalDependency):
+@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
                  old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
                  old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
  
@@ -25,10 +25,10 @@ index 9cfbd6f..3ff687a 100644
 -                    os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
 -
                  try:
-                     self.pkgdep = PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs)
-                     mlog.debug('Found "python-{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_version, pkg_libdir))
-@@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency):
-                     mlog.debug('"python-{}" could not be found in LIBPC ({})'.format(pkg_version, pkg_libdir))
+                     self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs)
+                     mlog.debug('Found "{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_name, pkg_libdir))
+@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
+                     mlog.debug('"{}" could not be found in LIBPC ({})'.format(pkg_name, pkg_libdir))
                      mlog.debug(e)
  
 -                if old_pkg_path is not None:
@@ -39,5 +39,5 @@ index 9cfbd6f..3ff687a 100644
 -                else:
 -                    os.environ.pop('PKG_CONFIG_LIBDIR', None)
              else:
-                 mlog.debug('"python-{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_version, pkg_libdir))
+                 mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir))
  
diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
index c8c7b298de3..1529ebe9fea 100644
--- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
+++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
@@ -1,4 +1,4 @@
-From 4d223562c3e510e0dd62b608d184604e2cab6198 Mon Sep 17 00:00:00 2001
+From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001
 From: Peter Kjellerstedt <pkj@axis.com>
 Date: Thu, 26 Jul 2018 16:32:49 +0200
 Subject: [PATCH] Support building allarch recipes again
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
  1 file changed, 1 insertion(+)
 
 diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
-index 5fb00a4..f5702ba 100644
+index 24578ea..216e71f 100644
 --- a/mesonbuild/envconfig.py
 +++ b/mesonbuild/envconfig.py
 @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
@@ -22,5 +22,5 @@ index 5fb00a4..f5702ba 100644
  known_cpu_families = (
 +    'allarch',
      'aarch64',
+     'alpha',
      'arc',
-     'arm',
diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
index 14a9a136664..76c1aa9ac1c 100644
--- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
+++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
@@ -1,4 +1,4 @@
-From baf7b94fec5a31b2d0cb162e43dbd28cc019f38e Mon Sep 17 00:00:00 2001
+From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001
 From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
 Date: Wed, 15 Nov 2017 15:05:01 +0100
 Subject: [PATCH] native_bindir
@@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
  2 files changed, 14 insertions(+), 11 deletions(-)
 
 diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
-index 35f0175..b39cba6 100644
+index f17b9f2..b5c9c92 100644
 --- a/mesonbuild/dependencies/base.py
 +++ b/mesonbuild/dependencies/base.py
 @@ -184,7 +184,7 @@ class Dependency:
@@ -43,7 +43,7 @@ index 35f0175..b39cba6 100644
          raise DependencyException('Method "get_pkgconfig_variable()" is '
                                    'invalid for an internal dependency')
  
-@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency):
+@@ -673,15 +673,18 @@ class PkgConfigDependency(ExternalDependency):
          return s.format(self.__class__.__name__, self.name, self.is_found,
                          self.version_reqs)
  
@@ -65,7 +65,7 @@ index 35f0175..b39cba6 100644
          # Always copy the environment since we're going to modify it
          # with pkg-config variables
          if env is None:
-@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -701,7 +704,7 @@ class PkgConfigDependency(ExternalDependency):
          targs = tuple(args)
          cache = PkgConfigDependency.pkgbin_cache
          if (self.pkgbin, targs, fenv) not in cache:
@@ -73,8 +73,8 @@ index 35f0175..b39cba6 100644
 +            cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native)
          return cache[(self.pkgbin, targs, fenv)]
  
-     def _convert_mingw_paths(self, args):
-@@ -885,7 +888,7 @@ class PkgConfigDependency(ExternalDependency):
+     def _convert_mingw_paths(self, args: List[str]) -> List[str]:
+@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
                                        (self.name, out_raw))
          self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
  
@@ -83,7 +83,7 @@ index 35f0175..b39cba6 100644
          options = ['--variable=' + variable_name, self.name]
  
          if 'define_variable' in kwargs:
-@@ -898,7 +901,7 @@ class PkgConfigDependency(ExternalDependency):
+@@ -920,7 +923,7 @@ class PkgConfigDependency(ExternalDependency):
  
              options = ['--define-variable=' + '='.join(definition)] + options
  
@@ -93,7 +93,7 @@ index 35f0175..b39cba6 100644
          if ret != 0:
              if self.required:
 diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
-index 6d784e6..73a9e13 100644
+index bdcc4a7..e2de847 100644
 --- a/mesonbuild/dependencies/ui.py
 +++ b/mesonbuild/dependencies/ui.py
 @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
diff --git a/meta/recipes-devtools/meson/meson_0.52.1.bb b/meta/recipes-devtools/meson/meson_0.53.0.bb
similarity index 100%
rename from meta/recipes-devtools/meson/meson_0.52.1.bb
rename to meta/recipes-devtools/meson/meson_0.53.0.bb
diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
similarity index 99%
rename from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
index 1756f342ce3..3e13c70438a 100644
--- a/meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
+++ b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
@@ -31,7 +31,7 @@ c = @CC
 cpp = @CXX
 ar = @AR
 nm = @NM
-ld = @LD
+ld = 'bfd'
 strip = @STRIP
 pkgconfig = 'pkg-config'
 
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH 2/5] core-image-sato-sdk-ptest: do not pull in ptest-pkgs
  2020-01-23 17:34 [PATCH 1/5] meson: update 0.52.1 -> 0.53.0 Alexander Kanavin
@ 2020-01-23 17:34 ` Alexander Kanavin
  2020-01-23 17:34 ` [PATCH 3/5] default-distrovars.inc: add vfat to DISTRO_FEATURES Alexander Kanavin
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2020-01-23 17:34 UTC (permalink / raw)
  To: openembedded-core

The lists of ptests are defined via PTESTS_FAST and PTESTS_SLOW;
ptests-pkgs also pulls in additional items that are specifically
excluded from those due to causing issues with ptesting.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
index ff297fe324c..7490b773d2e 100644
--- a/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
+++ b/meta/recipes-sato/images/core-image-sato-sdk-ptest.bb
@@ -3,8 +3,6 @@ require conf/distro/include/ptest-packagelists.inc
 
 DESCRIPTION += "Also includes ptest packages."
 
-IMAGE_FEATURES += "ptest-pkgs"
-
 PROVIDES += "core-image-sato-ptest"
 
 # Also include ptests which may not otherwise be included in a sato image
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH 3/5] default-distrovars.inc: add vfat to DISTRO_FEATURES
  2020-01-23 17:34 [PATCH 1/5] meson: update 0.52.1 -> 0.53.0 Alexander Kanavin
  2020-01-23 17:34 ` [PATCH 2/5] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
@ 2020-01-23 17:34 ` Alexander Kanavin
  2020-01-23 20:15   ` André Draszik
  2020-01-23 17:34 ` [PATCH 4/5] mdadm: correctly set up testing location for ptests Alexander Kanavin
                   ` (2 subsequent siblings)
  4 siblings, 1 reply; 12+ messages in thread
From: Alexander Kanavin @ 2020-01-23 17:34 UTC (permalink / raw)
  To: openembedded-core

This is beneficial for parted ptests in particular, as
they expect vfat functionality to work.

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/conf/distro/include/default-distrovars.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 10d86cf7b17..433d4b6651d 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -10,7 +10,7 @@ LOCALE_UTF8_ONLY ?= "0"
 LOCALE_UTF8_IS_DEFAULT ?= "1"
 LOCALE_UTF8_IS_DEFAULT_class-nativesdk = "0"
 
-DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth ext2 ipv4 ipv6 largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11"
+DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth ext2 ipv4 ipv6 largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc x11 vfat"
 DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT}"
 IMAGE_FEATURES ?= ""
 
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH 4/5] mdadm: correctly set up testing location for ptests
  2020-01-23 17:34 [PATCH 1/5] meson: update 0.52.1 -> 0.53.0 Alexander Kanavin
  2020-01-23 17:34 ` [PATCH 2/5] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
  2020-01-23 17:34 ` [PATCH 3/5] default-distrovars.inc: add vfat to DISTRO_FEATURES Alexander Kanavin
@ 2020-01-23 17:34 ` Alexander Kanavin
  2020-01-23 17:34 ` [PATCH 5/5] elfutils: additional ptest fixes Alexander Kanavin
  2020-01-23 19:27 ` [PATCH 1/5] meson: update 0.52.1 -> 0.53.0 Khem Raj
  4 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2020-01-23 17:34 UTC (permalink / raw)
  To: openembedded-core

1. Do not clutter /, create a special-purpose dir
2. Clean up the dir after tests are done (if this is not
performed, disk will overflow later in ptesting).
3. Fix up more locations in ptests to use the dir.

Upstream default /var/tmp is not suitable as it is not
big enough (mdadm needs about 500 Mb)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-extended/mdadm/files/run-ptest | 3 +++
 meta/recipes-extended/mdadm/mdadm_4.1.bb    | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/mdadm/files/run-ptest b/meta/recipes-extended/mdadm/files/run-ptest
index e4a9c2b08b9..7959c055ad5 100644
--- a/meta/recipes-extended/mdadm/files/run-ptest
+++ b/meta/recipes-extended/mdadm/files/run-ptest
@@ -1,4 +1,7 @@
 #!/bin/sh
 
+mkdir -p /mdadm-testing-dir
 # make the test continue to execute even one fail
 ./test --keep-going
+
+rm -rf /mdadm-testing-dir/*
diff --git a/meta/recipes-extended/mdadm/mdadm_4.1.bb b/meta/recipes-extended/mdadm/mdadm_4.1.bb
index 64f519e7502..40c5273e005 100644
--- a/meta/recipes-extended/mdadm/mdadm_4.1.bb
+++ b/meta/recipes-extended/mdadm/mdadm_4.1.bb
@@ -75,7 +75,8 @@ do_compile_ptest() {
 do_install_ptest() {
 	cp -R --no-dereference --preserve=mode,links -v ${S}/tests ${D}${PTEST_PATH}/tests
 	cp ${S}/test ${D}${PTEST_PATH}
-	sed -e 's!sleep 0.*!sleep 1!g; s!/var/tmp!/!g' -i ${D}${PTEST_PATH}/test
+	sed -e 's!sleep 0.*!sleep 1!g; s!/var/tmp!/mdadm-testing-dir!g' -i ${D}${PTEST_PATH}/test
+	sed -e 's!/var/tmp!/mdadm-testing-dir!g' -i ${D}${PTEST_PATH}/tests/*
         sed -i -e '/echo -ne "$_script... "/d' \
                -e 's/echo "succeeded"/echo -e "PASS: $_script"/g' \
                -e '/save_log fail/N; /_fail=1/i\\t\t\techo -ne "FAIL: $_script"' \
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 12+ messages in thread
* [PATCH 5/5] elfutils: additional ptest fixes
  2020-01-23 17:34 [PATCH 1/5] meson: update 0.52.1 -> 0.53.0 Alexander Kanavin
                   ` (2 preceding siblings ...)
  2020-01-23 17:34 ` [PATCH 4/5] mdadm: correctly set up testing location for ptests Alexander Kanavin
@ 2020-01-23 17:34 ` Alexander Kanavin
  2020-01-23 19:27 ` [PATCH 1/5] meson: update 0.52.1 -> 0.53.0 Khem Raj
  4 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2020-01-23 17:34 UTC (permalink / raw)
  To: openembedded-core

This should address ARM64 specific failures in particular.

eu-objdump is now installed on all architectures;
ptests fail in its absence and pass when it is present, so it's
useful at least in some scenarios in non-x86 architectures and
fails gracefully otherwise.

The original decision to exclude it was here:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=5283

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
 meta/recipes-devtools/elfutils/elfutils_0.178.bb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/elfutils/elfutils_0.178.bb b/meta/recipes-devtools/elfutils/elfutils_0.178.bb
index 9393628dd13..8f5deb2c62a 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.178.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.178.bb
@@ -58,11 +58,7 @@ RDEPENDS_${PN}-ptest += "libasm libelf bash make coreutils ${PN}-binutils"
 
 EXTRA_OECONF_append_class-target += "--disable-tests-rpath"
 
-do_install_append() {
-	if [ "${TARGET_ARCH}" != "x86_64" ] && [ -z `echo "${TARGET_ARCH}"|grep 'i.86'` ];then
-		rm -f ${D}${bindir}/eu-objdump
-	fi
-}
+RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils"
 
 do_compile_ptest() {
 	cd ${B}/tests
@@ -139,6 +135,7 @@ INHIBIT_PACKAGE_STRIP_FILES = "\
     ${PKGD}${PTEST_PATH}/tests/elfstrmerge \
     ${PKGD}${PTEST_PATH}/tests/backtrace-child \
     ${PKGD}${PTEST_PATH}/tests/backtrace-data \
+    ${PKGD}${PTEST_PATH}/tests/backtrace-dwarf \
     ${PKGD}${PTEST_PATH}/tests/deleted \
     ${PKGD}${PTEST_PATH}/src/strip \
     ${PKGD}${PTEST_PATH}/src/addr2line \
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 12+ messages in thread
* Re: [PATCH 1/5] meson: update 0.52.1 -> 0.53.0
  2020-01-23 17:34 [PATCH 1/5] meson: update 0.52.1 -> 0.53.0 Alexander Kanavin
                   ` (3 preceding siblings ...)
  2020-01-23 17:34 ` [PATCH 5/5] elfutils: additional ptest fixes Alexander Kanavin
@ 2020-01-23 19:27 ` Khem Raj
  2020-01-23 21:43   ` Alexander Kanavin
  4 siblings, 1 reply; 12+ messages in thread
From: Khem Raj @ 2020-01-23 19:27 UTC (permalink / raw)
  To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer

On Thu, Jan 23, 2020 at 9:34 AM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  meta/classes/meson.bbclass                       |  9 ++++++++-
>  meta/recipes-devtools/meson/meson.inc            |  4 ++--
>  .../0001-Make-CPU-family-warnings-fatal.patch    | 12 ++++++------
>  ...-do-not-manipulate-the-environment-when.patch | 16 ++++++++--------
>  ...-Support-building-allarch-recipes-again.patch |  6 +++---
>  .../meson/meson/0003-native_bindir.patch         | 16 ++++++++--------
>  .../meson/{meson_0.52.1.bb => meson_0.53.0.bb}   |  0
>  ...meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} |  2 +-
>  8 files changed, 36 insertions(+), 29 deletions(-)
>  rename meta/recipes-devtools/meson/{meson_0.52.1.bb => meson_0.53.0.bb} (100%)
>  rename meta/recipes-devtools/meson/{nativesdk-meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} (99%)
>
> diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
> index 1ef34a999c8..1837c9468e6 100644
> --- a/meta/classes/meson.bbclass
> +++ b/meta/classes/meson.bbclass
> @@ -85,13 +85,16 @@ addtask write_config before do_configure
>  do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS CXXFLAGS LDFLAGS"
>  do_write_config() {
>      # This needs to be Py to split the args into single-element lists
> +
> +    # Meson requires ld to be 'bfd, 'lld' or 'gold' from 0.53 onwards
> +    # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
>      cat >${WORKDIR}/meson.cross <<EOF
>  [binaries]
>  c = ${@meson_array('CC', d)}
>  cpp = ${@meson_array('CXX', d)}
>  ar = ${@meson_array('AR', d)}
>  nm = ${@meson_array('NM', d)}
> -ld = ${@meson_array('LD', d)}
> +ld = 'bfd'

there has to be a way to define it based on DISTRO_FEATURES containing
ld-is-gold
or ld-is-lld and perhaps also if someone adds

LDFLAGS += "-fuse-ld=<xxx>"

should work too. I am not sure if all these cases function if we make
this change.

>  strip = ${@meson_array('STRIP', d)}
>  readelf = ${@meson_array('READELF', d)}
>  pkgconfig = 'pkg-config'
> @@ -122,6 +125,10 @@ EOF
>  CONFIGURE_FILES = "meson.build"
>
>  meson_do_configure() {
> +    # Meson requires this to be 'bfd, 'lld' or 'gold' from 0.53 onwards
> +    # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
> +    unset LD
> +
>      # Work around "Meson fails if /tmp is mounted with noexec #2972"
>      mkdir -p "${B}/meson-private/tmp"
>      export TMPDIR="${B}/meson-private/tmp"
> diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
> index 881a14c7f0a..c0ce7d338bc 100644
> --- a/meta/recipes-devtools/meson/meson.inc
> +++ b/meta/recipes-devtools/meson/meson.inc
> @@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
>             file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
>             file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
>             "
> -SRC_URI[sha256sum] = "0c277472e49950a5537e3de3e60c57b80dbf425788470a1a8ed27446128fc035"
> -SRC_URI[md5sum] = "a5f0c99567d772508f649a28ded7f8ad"
> +SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6"
> +SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3"
>
>  SRC_URI_append_class-native = " \
>      file://0001-Make-CPU-family-warnings-fatal.patch \
> diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
> index d4264cee526..74d5b4ca66e 100644
> --- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
> +++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
> @@ -1,4 +1,4 @@
> -From cd980c763f11cfd928255346cc7e86f24add985e Mon Sep 17 00:00:00 2001
> +From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001
>  From: Ross Burton <ross.burton@intel.com>
>  Date: Tue, 3 Jul 2018 13:59:09 +0100
>  Subject: [PATCH] Make CPU family warnings fatal
> @@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
>   2 files changed, 2 insertions(+), 4 deletions(-)
>
>  diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
> -index 29d7422..5fb00a4 100644
> +index 0f277a7..24578ea 100644
>  --- a/mesonbuild/envconfig.py
>  +++ b/mesonbuild/envconfig.py
> -@@ -190,7 +190,7 @@ class MachineInfo:
> +@@ -192,7 +192,7 @@ class MachineInfo:
>
>           cpu_family = literal['cpu_family']
>           if cpu_family not in known_cpu_families:
> @@ -25,15 +25,15 @@ index 29d7422..5fb00a4 100644
>           endian = literal['endian']
>           if endian not in ('little', 'big'):
>  diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
> -index a9bc2b8..b91c8da 100644
> +index dc8b14f..3aab71e 100644
>  --- a/mesonbuild/environment.py
>  +++ b/mesonbuild/environment.py
> -@@ -348,9 +348,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
> +@@ -354,9 +354,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
>           trial = 'parisc'
>
>       if trial not in known_cpu_families:
>  -        mlog.warning('Unknown CPU family {!r}, please report this at '
> --                     'https://github.com/mesonbuild/meson/issues/new with the'
> +-                     'https://github.com/mesonbuild/meson/issues/new with the '
>  -                     'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial))
>  +        raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
>
> diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
> index bf715d1e9f4..eb0e90dbdda 100644
> --- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
> +++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
> @@ -1,4 +1,4 @@
> -From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00 2001
> +From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
>  From: Alexander Kanavin <alex.kanavin@gmail.com>
>  Date: Mon, 19 Nov 2018 14:24:26 +0100
>  Subject: [PATCH] python module: do not manipulate the environment when calling
> @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>   1 file changed, 12 deletions(-)
>
>  diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
> -index 9cfbd6f..3ff687a 100644
> +index 07be318..b770603 100644
>  --- a/mesonbuild/modules/python.py
>  +++ b/mesonbuild/modules/python.py
> -@@ -75,11 +75,6 @@ class PythonDependency(ExternalDependency):
> +@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
>                   old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
>                   old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
>
> @@ -25,10 +25,10 @@ index 9cfbd6f..3ff687a 100644
>  -                    os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
>  -
>                   try:
> -                     self.pkgdep = PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs)
> -                     mlog.debug('Found "python-{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_version, pkg_libdir))
> -@@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency):
> -                     mlog.debug('"python-{}" could not be found in LIBPC ({})'.format(pkg_version, pkg_libdir))
> +                     self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs)
> +                     mlog.debug('Found "{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_name, pkg_libdir))
> +@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
> +                     mlog.debug('"{}" could not be found in LIBPC ({})'.format(pkg_name, pkg_libdir))
>                       mlog.debug(e)
>
>  -                if old_pkg_path is not None:
> @@ -39,5 +39,5 @@ index 9cfbd6f..3ff687a 100644
>  -                else:
>  -                    os.environ.pop('PKG_CONFIG_LIBDIR', None)
>               else:
> -                 mlog.debug('"python-{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_version, pkg_libdir))
> +                 mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir))
>
> diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
> index c8c7b298de3..1529ebe9fea 100644
> --- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
> +++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
> @@ -1,4 +1,4 @@
> -From 4d223562c3e510e0dd62b608d184604e2cab6198 Mon Sep 17 00:00:00 2001
> +From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001
>  From: Peter Kjellerstedt <pkj@axis.com>
>  Date: Thu, 26 Jul 2018 16:32:49 +0200
>  Subject: [PATCH] Support building allarch recipes again
> @@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
>   1 file changed, 1 insertion(+)
>
>  diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
> -index 5fb00a4..f5702ba 100644
> +index 24578ea..216e71f 100644
>  --- a/mesonbuild/envconfig.py
>  +++ b/mesonbuild/envconfig.py
>  @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
> @@ -22,5 +22,5 @@ index 5fb00a4..f5702ba 100644
>   known_cpu_families = (
>  +    'allarch',
>       'aarch64',
> +     'alpha',
>       'arc',
> -     'arm',
> diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> index 14a9a136664..76c1aa9ac1c 100644
> --- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> +++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> @@ -1,4 +1,4 @@
> -From baf7b94fec5a31b2d0cb162e43dbd28cc019f38e Mon Sep 17 00:00:00 2001
> +From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001
>  From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>  Date: Wed, 15 Nov 2017 15:05:01 +0100
>  Subject: [PATCH] native_bindir
> @@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>   2 files changed, 14 insertions(+), 11 deletions(-)
>
>  diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
> -index 35f0175..b39cba6 100644
> +index f17b9f2..b5c9c92 100644
>  --- a/mesonbuild/dependencies/base.py
>  +++ b/mesonbuild/dependencies/base.py
>  @@ -184,7 +184,7 @@ class Dependency:
> @@ -43,7 +43,7 @@ index 35f0175..b39cba6 100644
>           raise DependencyException('Method "get_pkgconfig_variable()" is '
>                                     'invalid for an internal dependency')
>
> -@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency):
> +@@ -673,15 +673,18 @@ class PkgConfigDependency(ExternalDependency):
>           return s.format(self.__class__.__name__, self.name, self.is_found,
>                           self.version_reqs)
>
> @@ -65,7 +65,7 @@ index 35f0175..b39cba6 100644
>           # Always copy the environment since we're going to modify it
>           # with pkg-config variables
>           if env is None:
> -@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency):
> +@@ -701,7 +704,7 @@ class PkgConfigDependency(ExternalDependency):
>           targs = tuple(args)
>           cache = PkgConfigDependency.pkgbin_cache
>           if (self.pkgbin, targs, fenv) not in cache:
> @@ -73,8 +73,8 @@ index 35f0175..b39cba6 100644
>  +            cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native)
>           return cache[(self.pkgbin, targs, fenv)]
>
> -     def _convert_mingw_paths(self, args):
> -@@ -885,7 +888,7 @@ class PkgConfigDependency(ExternalDependency):
> +     def _convert_mingw_paths(self, args: List[str]) -> List[str]:
> +@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
>                                         (self.name, out_raw))
>           self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
>
> @@ -83,7 +83,7 @@ index 35f0175..b39cba6 100644
>           options = ['--variable=' + variable_name, self.name]
>
>           if 'define_variable' in kwargs:
> -@@ -898,7 +901,7 @@ class PkgConfigDependency(ExternalDependency):
> +@@ -920,7 +923,7 @@ class PkgConfigDependency(ExternalDependency):
>
>               options = ['--define-variable=' + '='.join(definition)] + options
>
> @@ -93,7 +93,7 @@ index 35f0175..b39cba6 100644
>           if ret != 0:
>               if self.required:
>  diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
> -index 6d784e6..73a9e13 100644
> +index bdcc4a7..e2de847 100644
>  --- a/mesonbuild/dependencies/ui.py
>  +++ b/mesonbuild/dependencies/ui.py
>  @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
> diff --git a/meta/recipes-devtools/meson/meson_0.52.1.bb b/meta/recipes-devtools/meson/meson_0.53.0.bb
> similarity index 100%
> rename from meta/recipes-devtools/meson/meson_0.52.1.bb
> rename to meta/recipes-devtools/meson/meson_0.53.0.bb
> diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
> similarity index 99%
> rename from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
> rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
> index 1756f342ce3..3e13c70438a 100644
> --- a/meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
> +++ b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
> @@ -31,7 +31,7 @@ c = @CC
>  cpp = @CXX
>  ar = @AR
>  nm = @NM
> -ld = @LD
> +ld = 'bfd'
>  strip = @STRIP
>  pkgconfig = 'pkg-config'
>
> --
> 2.17.1
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 3/5] default-distrovars.inc: add vfat to DISTRO_FEATURES
  2020-01-23 17:34 ` [PATCH 3/5] default-distrovars.inc: add vfat to DISTRO_FEATURES Alexander Kanavin
@ 2020-01-23 20:15   ` André Draszik
  2020-01-23 21:26     ` Alexander Kanavin
  0 siblings, 1 reply; 12+ messages in thread
From: André Draszik @ 2020-01-23 20:15 UTC (permalink / raw)
  To: openembedded-core

Hi,

On Thu, 2020-01-23 at 18:34 +0100, Alexander Kanavin wrote:
> This is beneficial for parted ptests in particular, as
> they expect vfat functionality to work.

Could you also update the parted ptests to skip or delete those
tests that depend on vfat, please? I.e. when the DISTRO_FEATURE
is not enabled.

For the benefit of those people that don't need / want vfat, but
still want to ensure that parted works by running the ptests.

Is that feasible?


Cheers,
Andre'

> 
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
>  meta/conf/distro/include/default-distrovars.inc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
> index 10d86cf7b17..433d4b6651d 100644
> --- a/meta/conf/distro/include/default-distrovars.inc
> +++ b/meta/conf/distro/include/default-distrovars.inc
> @@ -10,7 +10,7 @@ LOCALE_UTF8_ONLY ?= "0"
>  LOCALE_UTF8_IS_DEFAULT ?= "1"
>  LOCALE_UTF8_IS_DEFAULT_class-nativesdk = "0"
>  
> -DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth ext2 ipv4 ipv6 largefile pcmcia usbgadget usbhost wifi xattr nfs
> zeroconf pci 3g nfc x11"
> +DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth ext2 ipv4 ipv6 largefile pcmcia usbgadget usbhost wifi xattr nfs
> zeroconf pci 3g nfc x11 vfat"
>  DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT}"
>  IMAGE_FEATURES ?= ""
>  
> -- 
> 2.17.1
> 



^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 3/5] default-distrovars.inc: add vfat to DISTRO_FEATURES
  2020-01-23 20:15   ` André Draszik
@ 2020-01-23 21:26     ` Alexander Kanavin
  0 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2020-01-23 21:26 UTC (permalink / raw)
  To: André Draszik; +Cc: openembedded-core

Sorry but certainly no. It’s already hard enough to make ptests pass with just the one standard configuration tested by the autobuilder. I still have a handful of components with cryptic failures left to fix, so if you can help with valgrind, mdadm or lttng failures I’d appreciate that.

If you want parted test suite to handle things gracefully when vfat is absent, work with parted upstream to make it happen.

Alex

> On 23 Jan 2020, at 21.15, André Draszik <git@andred.net> wrote:
> 
> Hi,
> 
>> On Thu, 2020-01-23 at 18:34 +0100, Alexander Kanavin wrote:
>> This is beneficial for parted ptests in particular, as
>> they expect vfat functionality to work.
> 
> Could you also update the parted ptests to skip or delete those
> tests that depend on vfat, please? I.e. when the DISTRO_FEATURE
> is not enabled.
> 
> For the benefit of those people that don't need / want vfat, but
> still want to ensure that parted works by running the ptests.
> 
> Is that feasible?
> 
> 
> Cheers,
> Andre'
> 
>> 
>> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>> ---
>> meta/conf/distro/include/default-distrovars.inc | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
>> index 10d86cf7b17..433d4b6651d 100644
>> --- a/meta/conf/distro/include/default-distrovars.inc
>> +++ b/meta/conf/distro/include/default-distrovars.inc
>> @@ -10,7 +10,7 @@ LOCALE_UTF8_ONLY ?= "0"
>> LOCALE_UTF8_IS_DEFAULT ?= "1"
>> LOCALE_UTF8_IS_DEFAULT_class-nativesdk = "0"
>> 
>> -DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth ext2 ipv4 ipv6 largefile pcmcia usbgadget usbhost wifi xattr nfs
>> zeroconf pci 3g nfc x11"
>> +DISTRO_FEATURES_DEFAULT ?= "acl alsa argp bluetooth ext2 ipv4 ipv6 largefile pcmcia usbgadget usbhost wifi xattr nfs
>> zeroconf pci 3g nfc x11 vfat"
>> DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT}"
>> IMAGE_FEATURES ?= ""
>> 
>> -- 
>> 2.17.1
>> 
> 


^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 1/5] meson: update 0.52.1 -> 0.53.0
  2020-01-23 19:27 ` [PATCH 1/5] meson: update 0.52.1 -> 0.53.0 Khem Raj
@ 2020-01-23 21:43   ` Alexander Kanavin
  2020-01-23 22:36     ` Khem Raj
  0 siblings, 1 reply; 12+ messages in thread
From: Alexander Kanavin @ 2020-01-23 21:43 UTC (permalink / raw)
  To: Khem Raj; +Cc: Patches and discussions about the oe-core layer

I once more suggest we deal with all those special cases where linker customization is desired later on. New meson isn’t going to work without this change.

Alex

> On 23 Jan 2020, at 20.27, Khem Raj <raj.khem@gmail.com> wrote:
> 
> On Thu, Jan 23, 2020 at 9:34 AM Alexander Kanavin
> <alex.kanavin@gmail.com> wrote:
>> 
>> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>> ---
>> meta/classes/meson.bbclass                       |  9 ++++++++-
>> meta/recipes-devtools/meson/meson.inc            |  4 ++--
>> .../0001-Make-CPU-family-warnings-fatal.patch    | 12 ++++++------
>> ...-do-not-manipulate-the-environment-when.patch | 16 ++++++++--------
>> ...-Support-building-allarch-recipes-again.patch |  6 +++---
>> .../meson/meson/0003-native_bindir.patch         | 16 ++++++++--------
>> .../meson/{meson_0.52.1.bb => meson_0.53.0.bb}   |  0
>> ...meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} |  2 +-
>> 8 files changed, 36 insertions(+), 29 deletions(-)
>> rename meta/recipes-devtools/meson/{meson_0.52.1.bb => meson_0.53.0.bb} (100%)
>> rename meta/recipes-devtools/meson/{nativesdk-meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} (99%)
>> 
>> diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
>> index 1ef34a999c8..1837c9468e6 100644
>> --- a/meta/classes/meson.bbclass
>> +++ b/meta/classes/meson.bbclass
>> @@ -85,13 +85,16 @@ addtask write_config before do_configure
>> do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS CXXFLAGS LDFLAGS"
>> do_write_config() {
>>     # This needs to be Py to split the args into single-element lists
>> +
>> +    # Meson requires ld to be 'bfd, 'lld' or 'gold' from 0.53 onwards
>> +    # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
>>     cat >${WORKDIR}/meson.cross <<EOF
>> [binaries]
>> c = ${@meson_array('CC', d)}
>> cpp = ${@meson_array('CXX', d)}
>> ar = ${@meson_array('AR', d)}
>> nm = ${@meson_array('NM', d)}
>> -ld = ${@meson_array('LD', d)}
>> +ld = 'bfd'
> 
> there has to be a way to define it based on DISTRO_FEATURES containing
> ld-is-gold
> or ld-is-lld and perhaps also if someone adds
> 
> LDFLAGS += "-fuse-ld=<xxx>"
> 
> should work too. I am not sure if all these cases function if we make
> this change.
> 
>> strip = ${@meson_array('STRIP', d)}
>> readelf = ${@meson_array('READELF', d)}
>> pkgconfig = 'pkg-config'
>> @@ -122,6 +125,10 @@ EOF
>> CONFIGURE_FILES = "meson.build"
>> 
>> meson_do_configure() {
>> +    # Meson requires this to be 'bfd, 'lld' or 'gold' from 0.53 onwards
>> +    # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
>> +    unset LD
>> +
>>     # Work around "Meson fails if /tmp is mounted with noexec #2972"
>>     mkdir -p "${B}/meson-private/tmp"
>>     export TMPDIR="${B}/meson-private/tmp"
>> diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
>> index 881a14c7f0a..c0ce7d338bc 100644
>> --- a/meta/recipes-devtools/meson/meson.inc
>> +++ b/meta/recipes-devtools/meson/meson.inc
>> @@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
>>            file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
>>            file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
>>            "
>> -SRC_URI[sha256sum] = "0c277472e49950a5537e3de3e60c57b80dbf425788470a1a8ed27446128fc035"
>> -SRC_URI[md5sum] = "a5f0c99567d772508f649a28ded7f8ad"
>> +SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6"
>> +SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3"
>> 
>> SRC_URI_append_class-native = " \
>>     file://0001-Make-CPU-family-warnings-fatal.patch \
>> diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
>> index d4264cee526..74d5b4ca66e 100644
>> --- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
>> +++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
>> @@ -1,4 +1,4 @@
>> -From cd980c763f11cfd928255346cc7e86f24add985e Mon Sep 17 00:00:00 2001
>> +From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001
>> From: Ross Burton <ross.burton@intel.com>
>> Date: Tue, 3 Jul 2018 13:59:09 +0100
>> Subject: [PATCH] Make CPU family warnings fatal
>> @@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
>>  2 files changed, 2 insertions(+), 4 deletions(-)
>> 
>> diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
>> -index 29d7422..5fb00a4 100644
>> +index 0f277a7..24578ea 100644
>> --- a/mesonbuild/envconfig.py
>> +++ b/mesonbuild/envconfig.py
>> -@@ -190,7 +190,7 @@ class MachineInfo:
>> +@@ -192,7 +192,7 @@ class MachineInfo:
>> 
>>          cpu_family = literal['cpu_family']
>>          if cpu_family not in known_cpu_families:
>> @@ -25,15 +25,15 @@ index 29d7422..5fb00a4 100644
>>          endian = literal['endian']
>>          if endian not in ('little', 'big'):
>> diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
>> -index a9bc2b8..b91c8da 100644
>> +index dc8b14f..3aab71e 100644
>> --- a/mesonbuild/environment.py
>> +++ b/mesonbuild/environment.py
>> -@@ -348,9 +348,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
>> +@@ -354,9 +354,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
>>          trial = 'parisc'
>> 
>>      if trial not in known_cpu_families:
>> -        mlog.warning('Unknown CPU family {!r}, please report this at '
>> --                     'https://github.com/mesonbuild/meson/issues/new with the'
>> +-                     'https://github.com/mesonbuild/meson/issues/new with the '
>> -                     'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial))
>> +        raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
>> 
>> diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
>> index bf715d1e9f4..eb0e90dbdda 100644
>> --- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
>> +++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
>> @@ -1,4 +1,4 @@
>> -From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00 2001
>> +From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
>> From: Alexander Kanavin <alex.kanavin@gmail.com>
>> Date: Mon, 19 Nov 2018 14:24:26 +0100
>> Subject: [PATCH] python module: do not manipulate the environment when calling
>> @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>>  1 file changed, 12 deletions(-)
>> 
>> diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
>> -index 9cfbd6f..3ff687a 100644
>> +index 07be318..b770603 100644
>> --- a/mesonbuild/modules/python.py
>> +++ b/mesonbuild/modules/python.py
>> -@@ -75,11 +75,6 @@ class PythonDependency(ExternalDependency):
>> +@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
>>                  old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
>>                  old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
>> 
>> @@ -25,10 +25,10 @@ index 9cfbd6f..3ff687a 100644
>> -                    os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
>> -
>>                  try:
>> -                     self.pkgdep = PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs)
>> -                     mlog.debug('Found "python-{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_version, pkg_libdir))
>> -@@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency):
>> -                     mlog.debug('"python-{}" could not be found in LIBPC ({})'.format(pkg_version, pkg_libdir))
>> +                     self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs)
>> +                     mlog.debug('Found "{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_name, pkg_libdir))
>> +@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
>> +                     mlog.debug('"{}" could not be found in LIBPC ({})'.format(pkg_name, pkg_libdir))
>>                      mlog.debug(e)
>> 
>> -                if old_pkg_path is not None:
>> @@ -39,5 +39,5 @@ index 9cfbd6f..3ff687a 100644
>> -                else:
>> -                    os.environ.pop('PKG_CONFIG_LIBDIR', None)
>>              else:
>> -                 mlog.debug('"python-{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_version, pkg_libdir))
>> +                 mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir))
>> 
>> diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
>> index c8c7b298de3..1529ebe9fea 100644
>> --- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
>> +++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
>> @@ -1,4 +1,4 @@
>> -From 4d223562c3e510e0dd62b608d184604e2cab6198 Mon Sep 17 00:00:00 2001
>> +From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001
>> From: Peter Kjellerstedt <pkj@axis.com>
>> Date: Thu, 26 Jul 2018 16:32:49 +0200
>> Subject: [PATCH] Support building allarch recipes again
>> @@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
>>  1 file changed, 1 insertion(+)
>> 
>> diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
>> -index 5fb00a4..f5702ba 100644
>> +index 24578ea..216e71f 100644
>> --- a/mesonbuild/envconfig.py
>> +++ b/mesonbuild/envconfig.py
>> @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
>> @@ -22,5 +22,5 @@ index 5fb00a4..f5702ba 100644
>>  known_cpu_families = (
>> +    'allarch',
>>      'aarch64',
>> +     'alpha',
>>      'arc',
>> -     'arm',
>> diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
>> index 14a9a136664..76c1aa9ac1c 100644
>> --- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
>> +++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
>> @@ -1,4 +1,4 @@
>> -From baf7b94fec5a31b2d0cb162e43dbd28cc019f38e Mon Sep 17 00:00:00 2001
>> +From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001
>> From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>> Date: Wed, 15 Nov 2017 15:05:01 +0100
>> Subject: [PATCH] native_bindir
>> @@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>>  2 files changed, 14 insertions(+), 11 deletions(-)
>> 
>> diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
>> -index 35f0175..b39cba6 100644
>> +index f17b9f2..b5c9c92 100644
>> --- a/mesonbuild/dependencies/base.py
>> +++ b/mesonbuild/dependencies/base.py
>> @@ -184,7 +184,7 @@ class Dependency:
>> @@ -43,7 +43,7 @@ index 35f0175..b39cba6 100644
>>          raise DependencyException('Method "get_pkgconfig_variable()" is '
>>                                    'invalid for an internal dependency')
>> 
>> -@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency):
>> +@@ -673,15 +673,18 @@ class PkgConfigDependency(ExternalDependency):
>>          return s.format(self.__class__.__name__, self.name, self.is_found,
>>                          self.version_reqs)
>> 
>> @@ -65,7 +65,7 @@ index 35f0175..b39cba6 100644
>>          # Always copy the environment since we're going to modify it
>>          # with pkg-config variables
>>          if env is None:
>> -@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency):
>> +@@ -701,7 +704,7 @@ class PkgConfigDependency(ExternalDependency):
>>          targs = tuple(args)
>>          cache = PkgConfigDependency.pkgbin_cache
>>          if (self.pkgbin, targs, fenv) not in cache:
>> @@ -73,8 +73,8 @@ index 35f0175..b39cba6 100644
>> +            cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native)
>>          return cache[(self.pkgbin, targs, fenv)]
>> 
>> -     def _convert_mingw_paths(self, args):
>> -@@ -885,7 +888,7 @@ class PkgConfigDependency(ExternalDependency):
>> +     def _convert_mingw_paths(self, args: List[str]) -> List[str]:
>> +@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
>>                                        (self.name, out_raw))
>>          self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
>> 
>> @@ -83,7 +83,7 @@ index 35f0175..b39cba6 100644
>>          options = ['--variable=' + variable_name, self.name]
>> 
>>          if 'define_variable' in kwargs:
>> -@@ -898,7 +901,7 @@ class PkgConfigDependency(ExternalDependency):
>> +@@ -920,7 +923,7 @@ class PkgConfigDependency(ExternalDependency):
>> 
>>              options = ['--define-variable=' + '='.join(definition)] + options
>> 
>> @@ -93,7 +93,7 @@ index 35f0175..b39cba6 100644
>>          if ret != 0:
>>              if self.required:
>> diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
>> -index 6d784e6..73a9e13 100644
>> +index bdcc4a7..e2de847 100644
>> --- a/mesonbuild/dependencies/ui.py
>> +++ b/mesonbuild/dependencies/ui.py
>> @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
>> diff --git a/meta/recipes-devtools/meson/meson_0.52.1.bb b/meta/recipes-devtools/meson/meson_0.53.0.bb
>> similarity index 100%
>> rename from meta/recipes-devtools/meson/meson_0.52.1.bb
>> rename to meta/recipes-devtools/meson/meson_0.53.0.bb
>> diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
>> similarity index 99%
>> rename from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
>> rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
>> index 1756f342ce3..3e13c70438a 100644
>> --- a/meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
>> +++ b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
>> @@ -31,7 +31,7 @@ c = @CC
>> cpp = @CXX
>> ar = @AR
>> nm = @NM
>> -ld = @LD
>> +ld = 'bfd'
>> strip = @STRIP
>> pkgconfig = 'pkg-config'
>> 
>> --
>> 2.17.1
>> 
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core


^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 1/5] meson: update 0.52.1 -> 0.53.0
  2020-01-23 21:43   ` Alexander Kanavin
@ 2020-01-23 22:36     ` Khem Raj
  2020-01-24  9:09       ` Alexander Kanavin
  0 siblings, 1 reply; 12+ messages in thread
From: Khem Raj @ 2020-01-23 22:36 UTC (permalink / raw)
  To: Alexander Kanavin; +Cc: Patches and discussions about the oe-core layer

On Thu, Jan 23, 2020 at 1:43 PM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> I once more suggest we deal with all those special cases where linker customization is desired later on. New meson isn’t going to work without this change.
>
Perhaps I am missing something, what does new version gets us that we
could be willing to accept a regression?
 People are already using ld-is-gold in DISTRO_FEATURES

> Alex
>
> > On 23 Jan 2020, at 20.27, Khem Raj <raj.khem@gmail.com> wrote:
> >
> > On Thu, Jan 23, 2020 at 9:34 AM Alexander Kanavin
> > <alex.kanavin@gmail.com> wrote:
> >>
> >> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> >> ---
> >> meta/classes/meson.bbclass                       |  9 ++++++++-
> >> meta/recipes-devtools/meson/meson.inc            |  4 ++--
> >> .../0001-Make-CPU-family-warnings-fatal.patch    | 12 ++++++------
> >> ...-do-not-manipulate-the-environment-when.patch | 16 ++++++++--------
> >> ...-Support-building-allarch-recipes-again.patch |  6 +++---
> >> .../meson/meson/0003-native_bindir.patch         | 16 ++++++++--------
> >> .../meson/{meson_0.52.1.bb => meson_0.53.0.bb}   |  0
> >> ...meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} |  2 +-
> >> 8 files changed, 36 insertions(+), 29 deletions(-)
> >> rename meta/recipes-devtools/meson/{meson_0.52.1.bb => meson_0.53.0.bb} (100%)
> >> rename meta/recipes-devtools/meson/{nativesdk-meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} (99%)
> >>
> >> diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
> >> index 1ef34a999c8..1837c9468e6 100644
> >> --- a/meta/classes/meson.bbclass
> >> +++ b/meta/classes/meson.bbclass
> >> @@ -85,13 +85,16 @@ addtask write_config before do_configure
> >> do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS CXXFLAGS LDFLAGS"
> >> do_write_config() {
> >>     # This needs to be Py to split the args into single-element lists
> >> +
> >> +    # Meson requires ld to be 'bfd, 'lld' or 'gold' from 0.53 onwards
> >> +    # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
> >>     cat >${WORKDIR}/meson.cross <<EOF
> >> [binaries]
> >> c = ${@meson_array('CC', d)}
> >> cpp = ${@meson_array('CXX', d)}
> >> ar = ${@meson_array('AR', d)}
> >> nm = ${@meson_array('NM', d)}
> >> -ld = ${@meson_array('LD', d)}
> >> +ld = 'bfd'
> >
> > there has to be a way to define it based on DISTRO_FEATURES containing
> > ld-is-gold
> > or ld-is-lld and perhaps also if someone adds
> >
> > LDFLAGS += "-fuse-ld=<xxx>"
> >
> > should work too. I am not sure if all these cases function if we make
> > this change.
> >
> >> strip = ${@meson_array('STRIP', d)}
> >> readelf = ${@meson_array('READELF', d)}
> >> pkgconfig = 'pkg-config'
> >> @@ -122,6 +125,10 @@ EOF
> >> CONFIGURE_FILES = "meson.build"
> >>
> >> meson_do_configure() {
> >> +    # Meson requires this to be 'bfd, 'lld' or 'gold' from 0.53 onwards
> >> +    # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
> >> +    unset LD
> >> +
> >>     # Work around "Meson fails if /tmp is mounted with noexec #2972"
> >>     mkdir -p "${B}/meson-private/tmp"
> >>     export TMPDIR="${B}/meson-private/tmp"
> >> diff --git a/meta/recipes-devtools/meson/meson.inc b/meta/recipes-devtools/meson/meson.inc
> >> index 881a14c7f0a..c0ce7d338bc 100644
> >> --- a/meta/recipes-devtools/meson/meson.inc
> >> +++ b/meta/recipes-devtools/meson/meson.inc
> >> @@ -17,8 +17,8 @@ SRC_URI = "https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
> >>            file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
> >>            file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
> >>            "
> >> -SRC_URI[sha256sum] = "0c277472e49950a5537e3de3e60c57b80dbf425788470a1a8ed27446128fc035"
> >> -SRC_URI[md5sum] = "a5f0c99567d772508f649a28ded7f8ad"
> >> +SRC_URI[sha256sum] = "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6"
> >> +SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3"
> >>
> >> SRC_URI_append_class-native = " \
> >>     file://0001-Make-CPU-family-warnings-fatal.patch \
> >> diff --git a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
> >> index d4264cee526..74d5b4ca66e 100644
> >> --- a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
> >> +++ b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
> >> @@ -1,4 +1,4 @@
> >> -From cd980c763f11cfd928255346cc7e86f24add985e Mon Sep 17 00:00:00 2001
> >> +From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00 2001
> >> From: Ross Burton <ross.burton@intel.com>
> >> Date: Tue, 3 Jul 2018 13:59:09 +0100
> >> Subject: [PATCH] Make CPU family warnings fatal
> >> @@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com>
> >>  2 files changed, 2 insertions(+), 4 deletions(-)
> >>
> >> diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
> >> -index 29d7422..5fb00a4 100644
> >> +index 0f277a7..24578ea 100644
> >> --- a/mesonbuild/envconfig.py
> >> +++ b/mesonbuild/envconfig.py
> >> -@@ -190,7 +190,7 @@ class MachineInfo:
> >> +@@ -192,7 +192,7 @@ class MachineInfo:
> >>
> >>          cpu_family = literal['cpu_family']
> >>          if cpu_family not in known_cpu_families:
> >> @@ -25,15 +25,15 @@ index 29d7422..5fb00a4 100644
> >>          endian = literal['endian']
> >>          if endian not in ('little', 'big'):
> >> diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
> >> -index a9bc2b8..b91c8da 100644
> >> +index dc8b14f..3aab71e 100644
> >> --- a/mesonbuild/environment.py
> >> +++ b/mesonbuild/environment.py
> >> -@@ -348,9 +348,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
> >> +@@ -354,9 +354,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
> >>          trial = 'parisc'
> >>
> >>      if trial not in known_cpu_families:
> >> -        mlog.warning('Unknown CPU family {!r}, please report this at '
> >> --                     'https://github.com/mesonbuild/meson/issues/new with the'
> >> +-                     'https://github.com/mesonbuild/meson/issues/new with the '
> >> -                     'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial))
> >> +        raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
> >>
> >> diff --git a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
> >> index bf715d1e9f4..eb0e90dbdda 100644
> >> --- a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
> >> +++ b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
> >> @@ -1,4 +1,4 @@
> >> -From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00 2001
> >> +From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00 2001
> >> From: Alexander Kanavin <alex.kanavin@gmail.com>
> >> Date: Mon, 19 Nov 2018 14:24:26 +0100
> >> Subject: [PATCH] python module: do not manipulate the environment when calling
> >> @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> >>  1 file changed, 12 deletions(-)
> >>
> >> diff --git a/mesonbuild/modules/python.py b/mesonbuild/modules/python.py
> >> -index 9cfbd6f..3ff687a 100644
> >> +index 07be318..b770603 100644
> >> --- a/mesonbuild/modules/python.py
> >> +++ b/mesonbuild/modules/python.py
> >> -@@ -75,11 +75,6 @@ class PythonDependency(ExternalDependency):
> >> +@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
> >>                  old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
> >>                  old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
> >>
> >> @@ -25,10 +25,10 @@ index 9cfbd6f..3ff687a 100644
> >> -                    os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
> >> -
> >>                  try:
> >> -                     self.pkgdep = PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs)
> >> -                     mlog.debug('Found "python-{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_version, pkg_libdir))
> >> -@@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency):
> >> -                     mlog.debug('"python-{}" could not be found in LIBPC ({})'.format(pkg_version, pkg_libdir))
> >> +                     self.pkgdep = PkgConfigDependency(pkg_name, environment, kwargs)
> >> +                     mlog.debug('Found "{}" via pkgconfig lookup in LIBPC ({})'.format(pkg_name, pkg_libdir))
> >> +@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
> >> +                     mlog.debug('"{}" could not be found in LIBPC ({})'.format(pkg_name, pkg_libdir))
> >>                      mlog.debug(e)
> >>
> >> -                if old_pkg_path is not None:
> >> @@ -39,5 +39,5 @@ index 9cfbd6f..3ff687a 100644
> >> -                else:
> >> -                    os.environ.pop('PKG_CONFIG_LIBDIR', None)
> >>              else:
> >> -                 mlog.debug('"python-{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_version, pkg_libdir))
> >> +                 mlog.debug('"{}" could not be found in LIBPC ({}), this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir))
> >>
> >> diff --git a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
> >> index c8c7b298de3..1529ebe9fea 100644
> >> --- a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
> >> +++ b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
> >> @@ -1,4 +1,4 @@
> >> -From 4d223562c3e510e0dd62b608d184604e2cab6198 Mon Sep 17 00:00:00 2001
> >> +From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00 2001
> >> From: Peter Kjellerstedt <pkj@axis.com>
> >> Date: Thu, 26 Jul 2018 16:32:49 +0200
> >> Subject: [PATCH] Support building allarch recipes again
> >> @@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> >>  1 file changed, 1 insertion(+)
> >>
> >> diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
> >> -index 5fb00a4..f5702ba 100644
> >> +index 24578ea..216e71f 100644
> >> --- a/mesonbuild/envconfig.py
> >> +++ b/mesonbuild/envconfig.py
> >> @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
> >> @@ -22,5 +22,5 @@ index 5fb00a4..f5702ba 100644
> >>  known_cpu_families = (
> >> +    'allarch',
> >>      'aarch64',
> >> +     'alpha',
> >>      'arc',
> >> -     'arm',
> >> diff --git a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> >> index 14a9a136664..76c1aa9ac1c 100644
> >> --- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> >> +++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> >> @@ -1,4 +1,4 @@
> >> -From baf7b94fec5a31b2d0cb162e43dbd28cc019f38e Mon Sep 17 00:00:00 2001
> >> +From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00 2001
> >> From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> >> Date: Wed, 15 Nov 2017 15:05:01 +0100
> >> Subject: [PATCH] native_bindir
> >> @@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> >>  2 files changed, 14 insertions(+), 11 deletions(-)
> >>
> >> diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
> >> -index 35f0175..b39cba6 100644
> >> +index f17b9f2..b5c9c92 100644
> >> --- a/mesonbuild/dependencies/base.py
> >> +++ b/mesonbuild/dependencies/base.py
> >> @@ -184,7 +184,7 @@ class Dependency:
> >> @@ -43,7 +43,7 @@ index 35f0175..b39cba6 100644
> >>          raise DependencyException('Method "get_pkgconfig_variable()" is '
> >>                                    'invalid for an internal dependency')
> >>
> >> -@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency):
> >> +@@ -673,15 +673,18 @@ class PkgConfigDependency(ExternalDependency):
> >>          return s.format(self.__class__.__name__, self.name, self.is_found,
> >>                          self.version_reqs)
> >>
> >> @@ -65,7 +65,7 @@ index 35f0175..b39cba6 100644
> >>          # Always copy the environment since we're going to modify it
> >>          # with pkg-config variables
> >>          if env is None:
> >> -@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency):
> >> +@@ -701,7 +704,7 @@ class PkgConfigDependency(ExternalDependency):
> >>          targs = tuple(args)
> >>          cache = PkgConfigDependency.pkgbin_cache
> >>          if (self.pkgbin, targs, fenv) not in cache:
> >> @@ -73,8 +73,8 @@ index 35f0175..b39cba6 100644
> >> +            cache[(self.pkgbin, targs, fenv)] = self._call_pkgbin_real(args, env, use_native)
> >>          return cache[(self.pkgbin, targs, fenv)]
> >>
> >> -     def _convert_mingw_paths(self, args):
> >> -@@ -885,7 +888,7 @@ class PkgConfigDependency(ExternalDependency):
> >> +     def _convert_mingw_paths(self, args: List[str]) -> List[str]:
> >> +@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
> >>                                        (self.name, out_raw))
> >>          self.link_args, self.raw_link_args = self._search_libs(out, out_raw)
> >>
> >> @@ -83,7 +83,7 @@ index 35f0175..b39cba6 100644
> >>          options = ['--variable=' + variable_name, self.name]
> >>
> >>          if 'define_variable' in kwargs:
> >> -@@ -898,7 +901,7 @@ class PkgConfigDependency(ExternalDependency):
> >> +@@ -920,7 +923,7 @@ class PkgConfigDependency(ExternalDependency):
> >>
> >>              options = ['--define-variable=' + '='.join(definition)] + options
> >>
> >> @@ -93,7 +93,7 @@ index 35f0175..b39cba6 100644
> >>          if ret != 0:
> >>              if self.required:
> >> diff --git a/mesonbuild/dependencies/ui.py b/mesonbuild/dependencies/ui.py
> >> -index 6d784e6..73a9e13 100644
> >> +index bdcc4a7..e2de847 100644
> >> --- a/mesonbuild/dependencies/ui.py
> >> +++ b/mesonbuild/dependencies/ui.py
> >> @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
> >> diff --git a/meta/recipes-devtools/meson/meson_0.52.1.bb b/meta/recipes-devtools/meson/meson_0.53.0.bb
> >> similarity index 100%
> >> rename from meta/recipes-devtools/meson/meson_0.52.1.bb
> >> rename to meta/recipes-devtools/meson/meson_0.53.0.bb
> >> diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
> >> similarity index 99%
> >> rename from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
> >> rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
> >> index 1756f342ce3..3e13c70438a 100644
> >> --- a/meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
> >> +++ b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
> >> @@ -31,7 +31,7 @@ c = @CC
> >> cpp = @CXX
> >> ar = @AR
> >> nm = @NM
> >> -ld = @LD
> >> +ld = 'bfd'
> >> strip = @STRIP
> >> pkgconfig = 'pkg-config'
> >>
> >> --
> >> 2.17.1
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-core mailing list
> >> Openembedded-core@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-core


^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 1/5] meson: update 0.52.1 -> 0.53.0
  2020-01-23 22:36     ` Khem Raj
@ 2020-01-24  9:09       ` Alexander Kanavin
  2020-01-24 10:16         ` Alexander Kanavin
  0 siblings, 1 reply; 12+ messages in thread
From: Alexander Kanavin @ 2020-01-24  9:09 UTC (permalink / raw)
  To: Khem Raj; +Cc: Patches and discussions about the oe-core layer

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

Right, I'll take a closer look and make it honor the setting.

Alex

On Thu, 23 Jan 2020 at 23:36, Khem Raj <raj.khem@gmail.com> wrote:

> On Thu, Jan 23, 2020 at 1:43 PM Alexander Kanavin
> <alex.kanavin@gmail.com> wrote:
> >
> > I once more suggest we deal with all those special cases where linker
> customization is desired later on. New meson isn’t going to work without
> this change.
> >
> Perhaps I am missing something, what does new version gets us that we
> could be willing to accept a regression?
>  People are already using ld-is-gold in DISTRO_FEATURES
>
> > Alex
> >
> > > On 23 Jan 2020, at 20.27, Khem Raj <raj.khem@gmail.com> wrote:
> > >
> > > On Thu, Jan 23, 2020 at 9:34 AM Alexander Kanavin
> > > <alex.kanavin@gmail.com> wrote:
> > >>
> > >> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> > >> ---
> > >> meta/classes/meson.bbclass                       |  9 ++++++++-
> > >> meta/recipes-devtools/meson/meson.inc            |  4 ++--
> > >> .../0001-Make-CPU-family-warnings-fatal.patch    | 12 ++++++------
> > >> ...-do-not-manipulate-the-environment-when.patch | 16 ++++++++--------
> > >> ...-Support-building-allarch-recipes-again.patch |  6 +++---
> > >> .../meson/meson/0003-native_bindir.patch         | 16 ++++++++--------
> > >> .../meson/{meson_0.52.1.bb => meson_0.53.0.bb}   |  0
> > >> ...meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} |  2 +-
> > >> 8 files changed, 36 insertions(+), 29 deletions(-)
> > >> rename meta/recipes-devtools/meson/{meson_0.52.1.bb =>
> meson_0.53.0.bb} (100%)
> > >> rename meta/recipes-devtools/meson/{nativesdk-meson_0.52.1.bb =>
> nativesdk-meson_0.53.0.bb} (99%)
> > >>
> > >> diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
> > >> index 1ef34a999c8..1837c9468e6 100644
> > >> --- a/meta/classes/meson.bbclass
> > >> +++ b/meta/classes/meson.bbclass
> > >> @@ -85,13 +85,16 @@ addtask write_config before do_configure
> > >> do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS
> CXXFLAGS LDFLAGS"
> > >> do_write_config() {
> > >>     # This needs to be Py to split the args into single-element lists
> > >> +
> > >> +    # Meson requires ld to be 'bfd, 'lld' or 'gold' from 0.53 onwards
> > >> +    #
> https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
> > >>     cat >${WORKDIR}/meson.cross <<EOF
> > >> [binaries]
> > >> c = ${@meson_array('CC', d)}
> > >> cpp = ${@meson_array('CXX', d)}
> > >> ar = ${@meson_array('AR', d)}
> > >> nm = ${@meson_array('NM', d)}
> > >> -ld = ${@meson_array('LD', d)}
> > >> +ld = 'bfd'
> > >
> > > there has to be a way to define it based on DISTRO_FEATURES containing
> > > ld-is-gold
> > > or ld-is-lld and perhaps also if someone adds
> > >
> > > LDFLAGS += "-fuse-ld=<xxx>"
> > >
> > > should work too. I am not sure if all these cases function if we make
> > > this change.
> > >
> > >> strip = ${@meson_array('STRIP', d)}
> > >> readelf = ${@meson_array('READELF', d)}
> > >> pkgconfig = 'pkg-config'
> > >> @@ -122,6 +125,10 @@ EOF
> > >> CONFIGURE_FILES = "meson.build"
> > >>
> > >> meson_do_configure() {
> > >> +    # Meson requires this to be 'bfd, 'lld' or 'gold' from 0.53
> onwards
> > >> +    #
> https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
> > >> +    unset LD
> > >> +
> > >>     # Work around "Meson fails if /tmp is mounted with noexec #2972"
> > >>     mkdir -p "${B}/meson-private/tmp"
> > >>     export TMPDIR="${B}/meson-private/tmp"
> > >> diff --git a/meta/recipes-devtools/meson/meson.inc
> b/meta/recipes-devtools/meson/meson.inc
> > >> index 881a14c7f0a..c0ce7d338bc 100644
> > >> --- a/meta/recipes-devtools/meson/meson.inc
> > >> +++ b/meta/recipes-devtools/meson/meson.inc
> > >> @@ -17,8 +17,8 @@ SRC_URI = "
> https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
> > >>
> file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
> > >>
> file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
> > >>            "
> > >> -SRC_URI[sha256sum] =
> "0c277472e49950a5537e3de3e60c57b80dbf425788470a1a8ed27446128fc035"
> > >> -SRC_URI[md5sum] = "a5f0c99567d772508f649a28ded7f8ad"
> > >> +SRC_URI[sha256sum] =
> "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6"
> > >> +SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3"
> > >>
> > >> SRC_URI_append_class-native = " \
> > >>     file://0001-Make-CPU-family-warnings-fatal.patch \
> > >> diff --git
> a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
> b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
> > >> index d4264cee526..74d5b4ca66e 100644
> > >> ---
> a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
> > >> +++
> b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
> > >> @@ -1,4 +1,4 @@
> > >> -From cd980c763f11cfd928255346cc7e86f24add985e Mon Sep 17 00:00:00
> 2001
> > >> +From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00
> 2001
> > >> From: Ross Burton <ross.burton@intel.com>
> > >> Date: Tue, 3 Jul 2018 13:59:09 +0100
> > >> Subject: [PATCH] Make CPU family warnings fatal
> > >> @@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <ross.burton@intel.com
> >
> > >>  2 files changed, 2 insertions(+), 4 deletions(-)
> > >>
> > >> diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
> > >> -index 29d7422..5fb00a4 100644
> > >> +index 0f277a7..24578ea 100644
> > >> --- a/mesonbuild/envconfig.py
> > >> +++ b/mesonbuild/envconfig.py
> > >> -@@ -190,7 +190,7 @@ class MachineInfo:
> > >> +@@ -192,7 +192,7 @@ class MachineInfo:
> > >>
> > >>          cpu_family = literal['cpu_family']
> > >>          if cpu_family not in known_cpu_families:
> > >> @@ -25,15 +25,15 @@ index 29d7422..5fb00a4 100644
> > >>          endian = literal['endian']
> > >>          if endian not in ('little', 'big'):
> > >> diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
> > >> -index a9bc2b8..b91c8da 100644
> > >> +index dc8b14f..3aab71e 100644
> > >> --- a/mesonbuild/environment.py
> > >> +++ b/mesonbuild/environment.py
> > >> -@@ -348,9 +348,7 @@ def detect_cpu_family(compilers: CompilersDict)
> -> str:
> > >> +@@ -354,9 +354,7 @@ def detect_cpu_family(compilers: CompilersDict)
> -> str:
> > >>          trial = 'parisc'
> > >>
> > >>      if trial not in known_cpu_families:
> > >> -        mlog.warning('Unknown CPU family {!r}, please report this at
> '
> > >> --                     '
> https://github.com/mesonbuild/meson/issues/new with the'
> > >> +-                     '
> https://github.com/mesonbuild/meson/issues/new with the '
> > >> -                     'output of `uname -a` and `cat
> /proc/cpuinfo`'.format(trial))
> > >> +        raise EnvironmentException('Unknown CPU family %s, see
> https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' %
> trial)
> > >>
> > >> diff --git
> a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
> b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
> > >> index bf715d1e9f4..eb0e90dbdda 100644
> > >> ---
> a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
> > >> +++
> b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
> > >> @@ -1,4 +1,4 @@
> > >> -From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00
> 2001
> > >> +From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00
> 2001
> > >> From: Alexander Kanavin <alex.kanavin@gmail.com>
> > >> Date: Mon, 19 Nov 2018 14:24:26 +0100
> > >> Subject: [PATCH] python module: do not manipulate the environment
> when calling
> > >> @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <
> alex.kanavin@gmail.com>
> > >>  1 file changed, 12 deletions(-)
> > >>
> > >> diff --git a/mesonbuild/modules/python.py
> b/mesonbuild/modules/python.py
> > >> -index 9cfbd6f..3ff687a 100644
> > >> +index 07be318..b770603 100644
> > >> --- a/mesonbuild/modules/python.py
> > >> +++ b/mesonbuild/modules/python.py
> > >> -@@ -75,11 +75,6 @@ class PythonDependency(ExternalDependency):
> > >> +@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
> > >>                  old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
> > >>                  old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
> > >>
> > >> @@ -25,10 +25,10 @@ index 9cfbd6f..3ff687a 100644
> > >> -                    os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
> > >> -
> > >>                  try:
> > >> -                     self.pkgdep =
> PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs)
> > >> -                     mlog.debug('Found "python-{}" via pkgconfig
> lookup in LIBPC ({})'.format(pkg_version, pkg_libdir))
> > >> -@@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency):
> > >> -                     mlog.debug('"python-{}" could not be found in
> LIBPC ({})'.format(pkg_version, pkg_libdir))
> > >> +                     self.pkgdep = PkgConfigDependency(pkg_name,
> environment, kwargs)
> > >> +                     mlog.debug('Found "{}" via pkgconfig lookup in
> LIBPC ({})'.format(pkg_name, pkg_libdir))
> > >> +@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
> > >> +                     mlog.debug('"{}" could not be found in LIBPC
> ({})'.format(pkg_name, pkg_libdir))
> > >>                      mlog.debug(e)
> > >>
> > >> -                if old_pkg_path is not None:
> > >> @@ -39,5 +39,5 @@ index 9cfbd6f..3ff687a 100644
> > >> -                else:
> > >> -                    os.environ.pop('PKG_CONFIG_LIBDIR', None)
> > >>              else:
> > >> -                 mlog.debug('"python-{}" could not be found in LIBPC
> ({}), this is likely due to a relocated python
> installation'.format(pkg_version, pkg_libdir))
> > >> +                 mlog.debug('"{}" could not be found in LIBPC ({}),
> this is likely due to a relocated python installation'.format(pkg_name,
> pkg_libdir))
> > >>
> > >> diff --git
> a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
> b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
> > >> index c8c7b298de3..1529ebe9fea 100644
> > >> ---
> a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
> > >> +++
> b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
> > >> @@ -1,4 +1,4 @@
> > >> -From 4d223562c3e510e0dd62b608d184604e2cab6198 Mon Sep 17 00:00:00
> 2001
> > >> +From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00
> 2001
> > >> From: Peter Kjellerstedt <pkj@axis.com>
> > >> Date: Thu, 26 Jul 2018 16:32:49 +0200
> > >> Subject: [PATCH] Support building allarch recipes again
> > >> @@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <
> peter.kjellerstedt@axis.com>
> > >>  1 file changed, 1 insertion(+)
> > >>
> > >> diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
> > >> -index 5fb00a4..f5702ba 100644
> > >> +index 24578ea..216e71f 100644
> > >> --- a/mesonbuild/envconfig.py
> > >> +++ b/mesonbuild/envconfig.py
> > >> @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
> > >> @@ -22,5 +22,5 @@ index 5fb00a4..f5702ba 100644
> > >>  known_cpu_families = (
> > >> +    'allarch',
> > >>      'aarch64',
> > >> +     'alpha',
> > >>      'arc',
> > >> -     'arm',
> > >> diff --git
> a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> > >> index 14a9a136664..76c1aa9ac1c 100644
> > >> --- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> > >> +++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
> > >> @@ -1,4 +1,4 @@
> > >> -From baf7b94fec5a31b2d0cb162e43dbd28cc019f38e Mon Sep 17 00:00:00
> 2001
> > >> +From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00
> 2001
> > >> From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
> > >> Date: Wed, 15 Nov 2017 15:05:01 +0100
> > >> Subject: [PATCH] native_bindir
> > >> @@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <
> ricardo.ribalda@gmail.com>
> > >>  2 files changed, 14 insertions(+), 11 deletions(-)
> > >>
> > >> diff --git a/mesonbuild/dependencies/base.py
> b/mesonbuild/dependencies/base.py
> > >> -index 35f0175..b39cba6 100644
> > >> +index f17b9f2..b5c9c92 100644
> > >> --- a/mesonbuild/dependencies/base.py
> > >> +++ b/mesonbuild/dependencies/base.py
> > >> @@ -184,7 +184,7 @@ class Dependency:
> > >> @@ -43,7 +43,7 @@ index 35f0175..b39cba6 100644
> > >>          raise DependencyException('Method "get_pkgconfig_variable()"
> is '
> > >>                                    'invalid for an internal
> dependency')
> > >>
> > >> -@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency):
> > >> +@@ -673,15 +673,18 @@ class PkgConfigDependency(ExternalDependency):
> > >>          return s.format(self.__class__.__name__, self.name,
> self.is_found,
> > >>                          self.version_reqs)
> > >>
> > >> @@ -65,7 +65,7 @@ index 35f0175..b39cba6 100644
> > >>          # Always copy the environment since we're going to modify it
> > >>          # with pkg-config variables
> > >>          if env is None:
> > >> -@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency):
> > >> +@@ -701,7 +704,7 @@ class PkgConfigDependency(ExternalDependency):
> > >>          targs = tuple(args)
> > >>          cache = PkgConfigDependency.pkgbin_cache
> > >>          if (self.pkgbin, targs, fenv) not in cache:
> > >> @@ -73,8 +73,8 @@ index 35f0175..b39cba6 100644
> > >> +            cache[(self.pkgbin, targs, fenv)] =
> self._call_pkgbin_real(args, env, use_native)
> > >>          return cache[(self.pkgbin, targs, fenv)]
> > >>
> > >> -     def _convert_mingw_paths(self, args):
> > >> -@@ -885,7 +888,7 @@ class PkgConfigDependency(ExternalDependency):
> > >> +     def _convert_mingw_paths(self, args: List[str]) -> List[str]:
> > >> +@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
> > >>                                        (self.name, out_raw))
> > >>          self.link_args, self.raw_link_args = self._search_libs(out,
> out_raw)
> > >>
> > >> @@ -83,7 +83,7 @@ index 35f0175..b39cba6 100644
> > >>          options = ['--variable=' + variable_name, self.name]
> > >>
> > >>          if 'define_variable' in kwargs:
> > >> -@@ -898,7 +901,7 @@ class PkgConfigDependency(ExternalDependency):
> > >> +@@ -920,7 +923,7 @@ class PkgConfigDependency(ExternalDependency):
> > >>
> > >>              options = ['--define-variable=' + '='.join(definition)]
> + options
> > >>
> > >> @@ -93,7 +93,7 @@ index 35f0175..b39cba6 100644
> > >>          if ret != 0:
> > >>              if self.required:
> > >> diff --git a/mesonbuild/dependencies/ui.py
> b/mesonbuild/dependencies/ui.py
> > >> -index 6d784e6..73a9e13 100644
> > >> +index bdcc4a7..e2de847 100644
> > >> --- a/mesonbuild/dependencies/ui.py
> > >> +++ b/mesonbuild/dependencies/ui.py
> > >> @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
> > >> diff --git a/meta/recipes-devtools/meson/meson_0.52.1.bb
> b/meta/recipes-devtools/meson/meson_0.53.0.bb
> > >> similarity index 100%
> > >> rename from meta/recipes-devtools/meson/meson_0.52.1.bb
> > >> rename to meta/recipes-devtools/meson/meson_0.53.0.bb
> > >> diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
> b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
> > >> similarity index 99%
> > >> rename from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
> > >> rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
> > >> index 1756f342ce3..3e13c70438a 100644
> > >> --- a/meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
> > >> +++ b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
> > >> @@ -31,7 +31,7 @@ c = @CC
> > >> cpp = @CXX
> > >> ar = @AR
> > >> nm = @NM
> > >> -ld = @LD
> > >> +ld = 'bfd'
> > >> strip = @STRIP
> > >> pkgconfig = 'pkg-config'
> > >>
> > >> --
> > >> 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: 24257 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread
* Re: [PATCH 1/5] meson: update 0.52.1 -> 0.53.0
  2020-01-24  9:09       ` Alexander Kanavin
@ 2020-01-24 10:16         ` Alexander Kanavin
  0 siblings, 0 replies; 12+ messages in thread
From: Alexander Kanavin @ 2020-01-24 10:16 UTC (permalink / raw)
  To: Khem Raj; +Cc: Patches and discussions about the oe-core layer

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

Hard-coding ld to bfd in meson cross file wasn't necessary after all. I am
not sure what choice meson is going to make when it's not specified, but at
least it should be now possible to change it to something else. I will send
a corrected patch in a second.

Alex

On Fri, 24 Jan 2020 at 10:09, Alexander Kanavin <alex.kanavin@gmail.com>
wrote:

> Right, I'll take a closer look and make it honor the setting.
>
> Alex
>
> On Thu, 23 Jan 2020 at 23:36, Khem Raj <raj.khem@gmail.com> wrote:
>
>> On Thu, Jan 23, 2020 at 1:43 PM Alexander Kanavin
>> <alex.kanavin@gmail.com> wrote:
>> >
>> > I once more suggest we deal with all those special cases where linker
>> customization is desired later on. New meson isn’t going to work without
>> this change.
>> >
>> Perhaps I am missing something, what does new version gets us that we
>> could be willing to accept a regression?
>>  People are already using ld-is-gold in DISTRO_FEATURES
>>
>> > Alex
>> >
>> > > On 23 Jan 2020, at 20.27, Khem Raj <raj.khem@gmail.com> wrote:
>> > >
>> > > On Thu, Jan 23, 2020 at 9:34 AM Alexander Kanavin
>> > > <alex.kanavin@gmail.com> wrote:
>> > >>
>> > >> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
>> > >> ---
>> > >> meta/classes/meson.bbclass                       |  9 ++++++++-
>> > >> meta/recipes-devtools/meson/meson.inc            |  4 ++--
>> > >> .../0001-Make-CPU-family-warnings-fatal.patch    | 12 ++++++------
>> > >> ...-do-not-manipulate-the-environment-when.patch | 16
>> ++++++++--------
>> > >> ...-Support-building-allarch-recipes-again.patch |  6 +++---
>> > >> .../meson/meson/0003-native_bindir.patch         | 16
>> ++++++++--------
>> > >> .../meson/{meson_0.52.1.bb => meson_0.53.0.bb}   |  0
>> > >> ...meson_0.52.1.bb => nativesdk-meson_0.53.0.bb} |  2 +-
>> > >> 8 files changed, 36 insertions(+), 29 deletions(-)
>> > >> rename meta/recipes-devtools/meson/{meson_0.52.1.bb =>
>> meson_0.53.0.bb} (100%)
>> > >> rename meta/recipes-devtools/meson/{nativesdk-meson_0.52.1.bb =>
>> nativesdk-meson_0.53.0.bb} (99%)
>> > >>
>> > >> diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
>> > >> index 1ef34a999c8..1837c9468e6 100644
>> > >> --- a/meta/classes/meson.bbclass
>> > >> +++ b/meta/classes/meson.bbclass
>> > >> @@ -85,13 +85,16 @@ addtask write_config before do_configure
>> > >> do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS
>> CXXFLAGS LDFLAGS"
>> > >> do_write_config() {
>> > >>     # This needs to be Py to split the args into single-element lists
>> > >> +
>> > >> +    # Meson requires ld to be 'bfd, 'lld' or 'gold' from 0.53
>> onwards
>> > >> +    #
>> https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
>> > >>     cat >${WORKDIR}/meson.cross <<EOF
>> > >> [binaries]
>> > >> c = ${@meson_array('CC', d)}
>> > >> cpp = ${@meson_array('CXX', d)}
>> > >> ar = ${@meson_array('AR', d)}
>> > >> nm = ${@meson_array('NM', d)}
>> > >> -ld = ${@meson_array('LD', d)}
>> > >> +ld = 'bfd'
>> > >
>> > > there has to be a way to define it based on DISTRO_FEATURES containing
>> > > ld-is-gold
>> > > or ld-is-lld and perhaps also if someone adds
>> > >
>> > > LDFLAGS += "-fuse-ld=<xxx>"
>> > >
>> > > should work too. I am not sure if all these cases function if we make
>> > > this change.
>> > >
>> > >> strip = ${@meson_array('STRIP', d)}
>> > >> readelf = ${@meson_array('READELF', d)}
>> > >> pkgconfig = 'pkg-config'
>> > >> @@ -122,6 +125,10 @@ EOF
>> > >> CONFIGURE_FILES = "meson.build"
>> > >>
>> > >> meson_do_configure() {
>> > >> +    # Meson requires this to be 'bfd, 'lld' or 'gold' from 0.53
>> onwards
>> > >> +    #
>> https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3
>> > >> +    unset LD
>> > >> +
>> > >>     # Work around "Meson fails if /tmp is mounted with noexec #2972"
>> > >>     mkdir -p "${B}/meson-private/tmp"
>> > >>     export TMPDIR="${B}/meson-private/tmp"
>> > >> diff --git a/meta/recipes-devtools/meson/meson.inc
>> b/meta/recipes-devtools/meson/meson.inc
>> > >> index 881a14c7f0a..c0ce7d338bc 100644
>> > >> --- a/meta/recipes-devtools/meson/meson.inc
>> > >> +++ b/meta/recipes-devtools/meson/meson.inc
>> > >> @@ -17,8 +17,8 @@ SRC_URI = "
>> https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P
>> > >>
>> file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \
>> > >>
>> file://0001-modules-python.py-do-not-substitute-python-s-install.patch \
>> > >>            "
>> > >> -SRC_URI[sha256sum] =
>> "0c277472e49950a5537e3de3e60c57b80dbf425788470a1a8ed27446128fc035"
>> > >> -SRC_URI[md5sum] = "a5f0c99567d772508f649a28ded7f8ad"
>> > >> +SRC_URI[sha256sum] =
>> "035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6"
>> > >> +SRC_URI[md5sum] = "3a0313d040ded973d84cbec368c2e1d3"
>> > >>
>> > >> SRC_URI_append_class-native = " \
>> > >>     file://0001-Make-CPU-family-warnings-fatal.patch \
>> > >> diff --git
>> a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
>> b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
>> > >> index d4264cee526..74d5b4ca66e 100644
>> > >> ---
>> a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
>> > >> +++
>> b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch
>> > >> @@ -1,4 +1,4 @@
>> > >> -From cd980c763f11cfd928255346cc7e86f24add985e Mon Sep 17 00:00:00
>> 2001
>> > >> +From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00
>> 2001
>> > >> From: Ross Burton <ross.burton@intel.com>
>> > >> Date: Tue, 3 Jul 2018 13:59:09 +0100
>> > >> Subject: [PATCH] Make CPU family warnings fatal
>> > >> @@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <
>> ross.burton@intel.com>
>> > >>  2 files changed, 2 insertions(+), 4 deletions(-)
>> > >>
>> > >> diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
>> > >> -index 29d7422..5fb00a4 100644
>> > >> +index 0f277a7..24578ea 100644
>> > >> --- a/mesonbuild/envconfig.py
>> > >> +++ b/mesonbuild/envconfig.py
>> > >> -@@ -190,7 +190,7 @@ class MachineInfo:
>> > >> +@@ -192,7 +192,7 @@ class MachineInfo:
>> > >>
>> > >>          cpu_family = literal['cpu_family']
>> > >>          if cpu_family not in known_cpu_families:
>> > >> @@ -25,15 +25,15 @@ index 29d7422..5fb00a4 100644
>> > >>          endian = literal['endian']
>> > >>          if endian not in ('little', 'big'):
>> > >> diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
>> > >> -index a9bc2b8..b91c8da 100644
>> > >> +index dc8b14f..3aab71e 100644
>> > >> --- a/mesonbuild/environment.py
>> > >> +++ b/mesonbuild/environment.py
>> > >> -@@ -348,9 +348,7 @@ def detect_cpu_family(compilers: CompilersDict)
>> -> str:
>> > >> +@@ -354,9 +354,7 @@ def detect_cpu_family(compilers: CompilersDict)
>> -> str:
>> > >>          trial = 'parisc'
>> > >>
>> > >>      if trial not in known_cpu_families:
>> > >> -        mlog.warning('Unknown CPU family {!r}, please report this
>> at '
>> > >> --                     '
>> https://github.com/mesonbuild/meson/issues/new with the'
>> > >> +-                     '
>> https://github.com/mesonbuild/meson/issues/new with the '
>> > >> -                     'output of `uname -a` and `cat
>> /proc/cpuinfo`'.format(trial))
>> > >> +        raise EnvironmentException('Unknown CPU family %s, see
>> https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' %
>> trial)
>> > >>
>> > >> diff --git
>> a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
>> b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
>> > >> index bf715d1e9f4..eb0e90dbdda 100644
>> > >> ---
>> a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
>> > >> +++
>> b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch
>> > >> @@ -1,4 +1,4 @@
>> > >> -From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00
>> 2001
>> > >> +From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00
>> 2001
>> > >> From: Alexander Kanavin <alex.kanavin@gmail.com>
>> > >> Date: Mon, 19 Nov 2018 14:24:26 +0100
>> > >> Subject: [PATCH] python module: do not manipulate the environment
>> when calling
>> > >> @@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <
>> alex.kanavin@gmail.com>
>> > >>  1 file changed, 12 deletions(-)
>> > >>
>> > >> diff --git a/mesonbuild/modules/python.py
>> b/mesonbuild/modules/python.py
>> > >> -index 9cfbd6f..3ff687a 100644
>> > >> +index 07be318..b770603 100644
>> > >> --- a/mesonbuild/modules/python.py
>> > >> +++ b/mesonbuild/modules/python.py
>> > >> -@@ -75,11 +75,6 @@ class PythonDependency(ExternalDependency):
>> > >> +@@ -71,11 +71,6 @@ class PythonDependency(ExternalDependency):
>> > >>                  old_pkg_libdir = os.environ.get('PKG_CONFIG_LIBDIR')
>> > >>                  old_pkg_path = os.environ.get('PKG_CONFIG_PATH')
>> > >>
>> > >> @@ -25,10 +25,10 @@ index 9cfbd6f..3ff687a 100644
>> > >> -                    os.environ['PKG_CONFIG_LIBDIR'] = pkg_libdir
>> > >> -
>> > >>                  try:
>> > >> -                     self.pkgdep =
>> PkgConfigDependency('python-{}'.format(pkg_version), environment, kwargs)
>> > >> -                     mlog.debug('Found "python-{}" via pkgconfig
>> lookup in LIBPC ({})'.format(pkg_version, pkg_libdir))
>> > >> -@@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency):
>> > >> -                     mlog.debug('"python-{}" could not be found in
>> LIBPC ({})'.format(pkg_version, pkg_libdir))
>> > >> +                     self.pkgdep = PkgConfigDependency(pkg_name,
>> environment, kwargs)
>> > >> +                     mlog.debug('Found "{}" via pkgconfig lookup in
>> LIBPC ({})'.format(pkg_name, pkg_libdir))
>> > >> +@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
>> > >> +                     mlog.debug('"{}" could not be found in LIBPC
>> ({})'.format(pkg_name, pkg_libdir))
>> > >>                      mlog.debug(e)
>> > >>
>> > >> -                if old_pkg_path is not None:
>> > >> @@ -39,5 +39,5 @@ index 9cfbd6f..3ff687a 100644
>> > >> -                else:
>> > >> -                    os.environ.pop('PKG_CONFIG_LIBDIR', None)
>> > >>              else:
>> > >> -                 mlog.debug('"python-{}" could not be found in
>> LIBPC ({}), this is likely due to a relocated python
>> installation'.format(pkg_version, pkg_libdir))
>> > >> +                 mlog.debug('"{}" could not be found in LIBPC ({}),
>> this is likely due to a relocated python installation'.format(pkg_name,
>> pkg_libdir))
>> > >>
>> > >> diff --git
>> a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
>> b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
>> > >> index c8c7b298de3..1529ebe9fea 100644
>> > >> ---
>> a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
>> > >> +++
>> b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch
>> > >> @@ -1,4 +1,4 @@
>> > >> -From 4d223562c3e510e0dd62b608d184604e2cab6198 Mon Sep 17 00:00:00
>> 2001
>> > >> +From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00
>> 2001
>> > >> From: Peter Kjellerstedt <pkj@axis.com>
>> > >> Date: Thu, 26 Jul 2018 16:32:49 +0200
>> > >> Subject: [PATCH] Support building allarch recipes again
>> > >> @@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <
>> peter.kjellerstedt@axis.com>
>> > >>  1 file changed, 1 insertion(+)
>> > >>
>> > >> diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
>> > >> -index 5fb00a4..f5702ba 100644
>> > >> +index 24578ea..216e71f 100644
>> > >> --- a/mesonbuild/envconfig.py
>> > >> +++ b/mesonbuild/envconfig.py
>> > >> @@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
>> > >> @@ -22,5 +22,5 @@ index 5fb00a4..f5702ba 100644
>> > >>  known_cpu_families = (
>> > >> +    'allarch',
>> > >>      'aarch64',
>> > >> +     'alpha',
>> > >>      'arc',
>> > >> -     'arm',
>> > >> diff --git
>> a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
>> b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
>> > >> index 14a9a136664..76c1aa9ac1c 100644
>> > >> --- a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
>> > >> +++ b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch
>> > >> @@ -1,4 +1,4 @@
>> > >> -From baf7b94fec5a31b2d0cb162e43dbd28cc019f38e Mon Sep 17 00:00:00
>> 2001
>> > >> +From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00
>> 2001
>> > >> From: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
>> > >> Date: Wed, 15 Nov 2017 15:05:01 +0100
>> > >> Subject: [PATCH] native_bindir
>> > >> @@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <
>> ricardo.ribalda@gmail.com>
>> > >>  2 files changed, 14 insertions(+), 11 deletions(-)
>> > >>
>> > >> diff --git a/mesonbuild/dependencies/base.py
>> b/mesonbuild/dependencies/base.py
>> > >> -index 35f0175..b39cba6 100644
>> > >> +index f17b9f2..b5c9c92 100644
>> > >> --- a/mesonbuild/dependencies/base.py
>> > >> +++ b/mesonbuild/dependencies/base.py
>> > >> @@ -184,7 +184,7 @@ class Dependency:
>> > >> @@ -43,7 +43,7 @@ index 35f0175..b39cba6 100644
>> > >>          raise DependencyException('Method
>> "get_pkgconfig_variable()" is '
>> > >>                                    'invalid for an internal
>> dependency')
>> > >>
>> > >> -@@ -670,15 +670,18 @@ class PkgConfigDependency(ExternalDependency):
>> > >> +@@ -673,15 +673,18 @@ class PkgConfigDependency(ExternalDependency):
>> > >>          return s.format(self.__class__.__name__, self.name,
>> self.is_found,
>> > >>                          self.version_reqs)
>> > >>
>> > >> @@ -65,7 +65,7 @@ index 35f0175..b39cba6 100644
>> > >>          # Always copy the environment since we're going to modify it
>> > >>          # with pkg-config variables
>> > >>          if env is None:
>> > >> -@@ -698,7 +701,7 @@ class PkgConfigDependency(ExternalDependency):
>> > >> +@@ -701,7 +704,7 @@ class PkgConfigDependency(ExternalDependency):
>> > >>          targs = tuple(args)
>> > >>          cache = PkgConfigDependency.pkgbin_cache
>> > >>          if (self.pkgbin, targs, fenv) not in cache:
>> > >> @@ -73,8 +73,8 @@ index 35f0175..b39cba6 100644
>> > >> +            cache[(self.pkgbin, targs, fenv)] =
>> self._call_pkgbin_real(args, env, use_native)
>> > >>          return cache[(self.pkgbin, targs, fenv)]
>> > >>
>> > >> -     def _convert_mingw_paths(self, args):
>> > >> -@@ -885,7 +888,7 @@ class PkgConfigDependency(ExternalDependency):
>> > >> +     def _convert_mingw_paths(self, args: List[str]) -> List[str]:
>> > >> +@@ -907,7 +910,7 @@ class PkgConfigDependency(ExternalDependency):
>> > >>                                        (self.name, out_raw))
>> > >>          self.link_args, self.raw_link_args = self._search_libs(out,
>> out_raw)
>> > >>
>> > >> @@ -83,7 +83,7 @@ index 35f0175..b39cba6 100644
>> > >>          options = ['--variable=' + variable_name, self.name]
>> > >>
>> > >>          if 'define_variable' in kwargs:
>> > >> -@@ -898,7 +901,7 @@ class PkgConfigDependency(ExternalDependency):
>> > >> +@@ -920,7 +923,7 @@ class PkgConfigDependency(ExternalDependency):
>> > >>
>> > >>              options = ['--define-variable=' + '='.join(definition)]
>> + options
>> > >>
>> > >> @@ -93,7 +93,7 @@ index 35f0175..b39cba6 100644
>> > >>          if ret != 0:
>> > >>              if self.required:
>> > >> diff --git a/mesonbuild/dependencies/ui.py
>> b/mesonbuild/dependencies/ui.py
>> > >> -index 6d784e6..73a9e13 100644
>> > >> +index bdcc4a7..e2de847 100644
>> > >> --- a/mesonbuild/dependencies/ui.py
>> > >> +++ b/mesonbuild/dependencies/ui.py
>> > >> @@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
>> > >> diff --git a/meta/recipes-devtools/meson/meson_0.52.1.bb
>> b/meta/recipes-devtools/meson/meson_0.53.0.bb
>> > >> similarity index 100%
>> > >> rename from meta/recipes-devtools/meson/meson_0.52.1.bb
>> > >> rename to meta/recipes-devtools/meson/meson_0.53.0.bb
>> > >> diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
>> b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
>> > >> similarity index 99%
>> > >> rename from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
>> > >> rename to meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
>> > >> index 1756f342ce3..3e13c70438a 100644
>> > >> --- a/meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb
>> > >> +++ b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb
>> > >> @@ -31,7 +31,7 @@ c = @CC
>> > >> cpp = @CXX
>> > >> ar = @AR
>> > >> nm = @NM
>> > >> -ld = @LD
>> > >> +ld = 'bfd'
>> > >> strip = @STRIP
>> > >> pkgconfig = 'pkg-config'
>> > >>
>> > >> --
>> > >> 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: 24952 bytes --]

^ permalink raw reply	[flat|nested] 12+ messages in thread
end of thread, other threads:[~2020-01-24 10:16 UTC | newest]

Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-23 17:34 [PATCH 1/5] meson: update 0.52.1 -> 0.53.0 Alexander Kanavin
2020-01-23 17:34 ` [PATCH 2/5] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
2020-01-23 17:34 ` [PATCH 3/5] default-distrovars.inc: add vfat to DISTRO_FEATURES Alexander Kanavin
2020-01-23 20:15   ` André Draszik
2020-01-23 21:26     ` Alexander Kanavin
2020-01-23 17:34 ` [PATCH 4/5] mdadm: correctly set up testing location for ptests Alexander Kanavin
2020-01-23 17:34 ` [PATCH 5/5] elfutils: additional ptest fixes Alexander Kanavin
2020-01-23 19:27 ` [PATCH 1/5] meson: update 0.52.1 -> 0.53.0 Khem Raj
2020-01-23 21:43   ` Alexander Kanavin
2020-01-23 22:36     ` Khem Raj
2020-01-24  9:09       ` Alexander Kanavin
2020-01-24 10:16         ` Alexander Kanavin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.