Skip to contentSkip to conversation

meson: update 0.52.1 -> 0.53.0

PATCH In review Alexander Kanavin 3 participants 12 messages Jan 23, 2020 – Jan 24, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 meson: update 0.52.1 -> 0.53.0

---
 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%)
meta/classes/meson.bbclass +8 -1
index 1ef34a999c8..1837c9468e6 100644
@@ -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"
meta/recipes-devtools/meson/meson.inc +2 -2
index 881a14c7f0a..c0ce7d338bc 100644
@@ -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 \
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +6 -6
index d4264cee526..74d5b4ca66e 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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)
  
meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +8 -8
index bf715d1e9f4..eb0e90dbdda 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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))
  
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +3 -3
index c8c7b298de3..1529ebe9fea 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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',
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +8 -8
index 14a9a136664..76c1aa9ac1c 100644
@@ -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 <[email protected]>
 Date: Wed, 15 Nov 2017 15:05:01 +0100
 Subject: [PATCH] native_bindir
@@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <[email protected]>
  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):
meta/recipes-devtools/meson/meson_0.53.0.bb renamed from meta/recipes-devtools/meson/meson_0.52.1.bb +0 -0
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
meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb +1 -1
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
@@ -31,7 +31,7 @@ c = @CC
 cpp = @CXX
 ar = @AR
 nm = @NM
-ld = @LD
+ld = 'bfd'
 strip = @STRIP
 pkgconfig = 'pkg-config'
 
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/5 core-image-sato-sdk-ptest: do not pull in ptest-pkgs

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.

---
 meta/recipes-sato/images/core-image-sato-sdk-ptest.bb | 2 --
 1 file changed, 2 deletions(-)
meta/recipes-sato/images/core-image-sato-sdk-ptest.bb +0 -2
index ff297fe324c..7490b773d2e 100644
@@ -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
Signature · 1 line
2.17.1
#2 lore raw

PATCH 3/5 default-distrovars.inc: add vfat to DISTRO_FEATURES

In reply to Alexander Kanavin

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

---
 meta/conf/distro/include/default-distrovars.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/default-distrovars.inc +1 -1
index 10d86cf7b17..433d4b6651d 100644
@@ -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 ?= ""
 
Signature · 1 line
2.17.1
#3 lore raw

Re: [PATCH 3/5] default-distrovars.inc: add vfat to DISTRO_FEATURES

Hi,

Quoted 2 lines · Alexander Kanavin

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'

Quoted 24 lines
---
 meta/conf/distro/include/default-distrovars.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/default-distrovars.inc +0 -1
index 10d86cf7b17..433d4b6651d 100644
@@ -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 ?= ""

Signature · 1 line
2.17.1
#4 lore raw

Re: [PATCH 3/5] default-distrovars.inc: add vfat to DISTRO_FEATURES

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

Quoted 46 lines · André Draszik

Hi,

Quoted 3 lines · Alexander Kanavin

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'

Quoted 24 lines

---
meta/conf/distro/include/default-distrovars.inc | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/distro/include/default-distrovars.inc +0 -0
index 10d86cf7b17..433d4b6651d 100644
@@ -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 ?= ""

Signature · 1 line
2.17.1
#5 lore raw

PATCH 4/5 mdadm: correctly set up testing location for ptests

In reply to Alexander Kanavin

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)

---
 meta/recipes-extended/mdadm/files/run-ptest | 3 +++
 meta/recipes-extended/mdadm/mdadm_4.1.bb    | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)
meta/recipes-extended/mdadm/files/run-ptest +3 -0
index e4a9c2b08b9..7959c055ad5 100644
@@ -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/*
meta/recipes-extended/mdadm/mdadm_4.1.bb +2 -1
index 64f519e7502..40c5273e005 100644
@@ -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"' \
Signature · 1 line
2.17.1
#6 lore raw

PATCH 5/5 elfutils: additional ptest fixes

In reply to Alexander Kanavin

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

---
 meta/recipes-devtools/elfutils/elfutils_0.178.bb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
meta/recipes-devtools/elfutils/elfutils_0.178.bb +2 -5
index 9393628dd13..8f5deb2c62a 100644
@@ -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 \
Signature · 1 line
2.17.1
#7 lore raw
In reply to Alexander Kanavin
Quoted 24 lines · Alexander Kanavin
---
 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%)
meta/classes/meson.bbclass +1 -0
index 1ef34a999c8..1837c9468e6 100644
@@ -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
+

meta/classes/meson.bbclass addtask write_config before do_configure · line 97

Quoted 10 lines
meta/classes/meson.bbclass +3 -1
+    # 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.

Quoted 236 lines
meta/classes/meson.bbclass +4 -0
 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"
meta/recipes-devtools/meson/meson.inc +2 -2
index 881a14c7f0a..c0ce7d338bc 100644
@@ -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 \
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +6 -6
index d4264cee526..74d5b4ca66e 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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)
 
meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +8 -8
index bf715d1e9f4..eb0e90dbdda 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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))
 
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +3 -3
index c8c7b298de3..1529ebe9fea 100644
@@ -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 <[email protected]>
 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 <[email protected]>
  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',
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +8 -8
index 14a9a136664..76c1aa9ac1c 100644
@@ -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 <[email protected]>
 Date: Wed, 15 Nov 2017 15:05:01 +0100
 Subject: [PATCH] native_bindir
@@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <[email protected]>
  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):
meta/recipes-devtools/meson/meson_0.53.0.bb renamed from meta/recipes-devtools/meson/meson_0.52.1.bb +0 -0
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
meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb +1 -2
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
@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#8 lore raw

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

Quoted 284 lines · Khem Raj
Quoted 32 lines · Alexander Kanavin

---

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%)

meta/classes/meson.bbclass +0 -0
index 1ef34a999c8..1837c9468e6 100644
@@ -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

meta/classes/meson.bbclass +3 -0
+
+    # 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)}

meta/classes/meson.bbclass addtask write_config before do_configure · line 97

Quoted 2 lines
meta/classes/meson.bbclass +1 -1
-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.

Quoted 236 lines

strip = ${@meson_array('STRIP', d)}
readelf = ${@meson_array('READELF', d)}
pkgconfig = 'pkg-config'

meta/classes/meson.bbclass +0 -0
@@ -122,6 +125,10 @@ EOF

CONFIGURE_FILES = "meson.build"

meson_do_configure() {

meta/classes/meson.bbclass +4 -0
+    # 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"
meta/recipes-devtools/meson/meson.inc +2 -2
index 881a14c7f0a..c0ce7d338bc 100644
@@ -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 \
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +1 -1
index d4264cee526..74d5b4ca66e 100644
@@ -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 <[email protected]>
Date: Tue, 3 Jul 2018 13:59:09 +0100
Subject: [PATCH] Make CPU family warnings fatal

meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +0 -0
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <[email protected]>
 2 files changed, 2 insertions(+), 4 deletions(-)
 
mesonbuild/envconfig.py +1 -1
-index 29d7422..5fb00a4 100644
+index 0f277a7..24578ea 100644
mesonbuild/envconfig.py +1 -1
-@@ -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'):
mesonbuild/environment.py +1 -1
-index a9bc2b8..b91c8da 100644
+index dc8b14f..3aab71e 100644
mesonbuild/environment.py +3 -4
-@@ -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)
meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +1 -1
index bf715d1e9f4..eb0e90dbdda 100644
@@ -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 <[email protected]>
Date: Mon, 19 Nov 2018 14:24:26 +0100
Subject: [PATCH] python module: do not manipulate the environment when calling

meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +0 -0
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <[email protected]>
 1 file changed, 12 deletions(-)
 
mesonbuild/modules/python.py +1 -1
-index 9cfbd6f..3ff687a 100644
+index 07be318..b770603 100644
mesonbuild/modules/python.py +6 -11
-@@ -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))
 
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +1 -1
index c8c7b298de3..1529ebe9fea 100644
@@ -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 <[email protected]>
Date: Thu, 26 Jul 2018 16:32:49 +0200
Subject: [PATCH] Support building allarch recipes again

meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +0 -0
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <[email protected]>
 1 file changed, 1 insertion(+)
 
mesonbuild/envconfig.py +1 -1
-index 5fb00a4..f5702ba 100644
+index 24578ea..216e71f 100644
mesonbuild/envconfig.py +2 -1
@@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
@@ -22,5 +22,5 @@ index 5fb00a4..f5702ba 100644
 known_cpu_families = (
+    'allarch',
     'aarch64',
+     'alpha',
     'arc',
-     'arm',
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -1
index 14a9a136664..76c1aa9ac1c 100644
@@ -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 <[email protected]>
Date: Wed, 15 Nov 2017 15:05:01 +0100
Subject: [PATCH] native_bindir

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
@@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <[email protected]>
 2 files changed, 14 insertions(+), 11 deletions(-)
 
mesonbuild/dependencies/base.py +1 -1
-index 35f0175..b39cba6 100644
+index f17b9f2..b5c9c92 100644
mesonbuild/dependencies/base.py +6 -5
@@ -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:
mesonbuild/dependencies/ui.py +1 -1
-index 6d784e6..73a9e13 100644
+index bdcc4a7..e2de847 100644
mesonbuild/dependencies/ui.py +0 -0
@@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
meta/recipes-devtools/meson/meson_0.53.0.bb renamed from meta/recipes-devtools/meson/meson_0.52.1.bb +0 -0
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
meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb +0 -0
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
@@ -31,7 +31,7 @@ c = @CC

cpp = @CXX
ar = @AR
nm = @NM

meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb +1 -1
-ld = @LD
+ld = 'bfd'

strip = @STRIP
pkgconfig = 'pkg-config'

--
2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#9 lore raw
Quoted 3 lines · Alexander Kanavin

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

Quoted 286 lines

Alex

Quoted 284 lines · Khem Raj
Quoted 32 lines · Alexander Kanavin

---

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%)

meta/classes/meson.bbclass +0 -0
index 1ef34a999c8..1837c9468e6 100644
@@ -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

meta/classes/meson.bbclass +3 -0
+
+    # 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)}

meta/classes/meson.bbclass addtask write_config before do_configure · line 97

Quoted 2 lines
meta/classes/meson.bbclass +1 -1
-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.

Quoted 236 lines

strip = ${@meson_array('STRIP', d)}
readelf = ${@meson_array('READELF', d)}
pkgconfig = 'pkg-config'

meta/classes/meson.bbclass +0 -0
@@ -122,6 +125,10 @@ EOF

CONFIGURE_FILES = "meson.build"

meson_do_configure() {

meta/classes/meson.bbclass +4 -0
+    # 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"
meta/recipes-devtools/meson/meson.inc +2 -2
index 881a14c7f0a..c0ce7d338bc 100644
@@ -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 \
meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +1 -1
index d4264cee526..74d5b4ca66e 100644
@@ -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 <[email protected]>
Date: Tue, 3 Jul 2018 13:59:09 +0100
Subject: [PATCH] Make CPU family warnings fatal

meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch +0 -0
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <[email protected]>
 2 files changed, 2 insertions(+), 4 deletions(-)
 
mesonbuild/envconfig.py +1 -1
-index 29d7422..5fb00a4 100644
+index 0f277a7..24578ea 100644
mesonbuild/envconfig.py +1 -1
-@@ -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'):
mesonbuild/environment.py +1 -1
-index a9bc2b8..b91c8da 100644
+index dc8b14f..3aab71e 100644
mesonbuild/environment.py +3 -4
-@@ -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)
meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +1 -1
index bf715d1e9f4..eb0e90dbdda 100644
@@ -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 <[email protected]>
Date: Mon, 19 Nov 2018 14:24:26 +0100
Subject: [PATCH] python module: do not manipulate the environment when calling

meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +0 -0
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <[email protected]>
 1 file changed, 12 deletions(-)
 
mesonbuild/modules/python.py +1 -1
-index 9cfbd6f..3ff687a 100644
+index 07be318..b770603 100644
mesonbuild/modules/python.py +6 -11
-@@ -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))
 
meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +1 -1
index c8c7b298de3..1529ebe9fea 100644
@@ -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 <[email protected]>
Date: Thu, 26 Jul 2018 16:32:49 +0200
Subject: [PATCH] Support building allarch recipes again

meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch +0 -0
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <[email protected]>
 1 file changed, 1 insertion(+)
 
mesonbuild/envconfig.py +1 -1
-index 5fb00a4..f5702ba 100644
+index 24578ea..216e71f 100644
mesonbuild/envconfig.py +2 -1
@@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
@@ -22,5 +22,5 @@ index 5fb00a4..f5702ba 100644
 known_cpu_families = (
+    'allarch',
     'aarch64',
+     'alpha',
     'arc',
-     'arm',
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -1
index 14a9a136664..76c1aa9ac1c 100644
@@ -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 <[email protected]>
Date: Wed, 15 Nov 2017 15:05:01 +0100
Subject: [PATCH] native_bindir

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
@@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <[email protected]>
 2 files changed, 14 insertions(+), 11 deletions(-)
 
mesonbuild/dependencies/base.py +1 -1
-index 35f0175..b39cba6 100644
+index f17b9f2..b5c9c92 100644
mesonbuild/dependencies/base.py +6 -5
@@ -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:
mesonbuild/dependencies/ui.py +1 -1
-index 6d784e6..73a9e13 100644
+index bdcc4a7..e2de847 100644
mesonbuild/dependencies/ui.py +0 -0
@@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
meta/recipes-devtools/meson/meson_0.53.0.bb renamed from meta/recipes-devtools/meson/meson_0.52.1.bb +0 -0
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
meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb +0 -0
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
@@ -31,7 +31,7 @@ c = @CC

cpp = @CXX
ar = @AR
nm = @NM

meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb +1 -1
-ld = @LD
+ld = 'bfd'

strip = @STRIP
pkgconfig = 'pkg-config'

--
2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#10 lore raw

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

Alex

Quoted 366 lines · Khem Raj
Quoted 2 lines · Alexander Kanavin

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.

Quoted 1 line

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

Quoted 19 lines

Alex

Quoted 17 lines · Khem Raj
Quoted 13 lines · Alexander Kanavin

---

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%)

Quoted 1 line
Quoted 1 line
Quoted 1 line

rename meta/recipes-devtools/meson/{nativesdk-meson_0.52.1.bb =>

nativesdk-meson_0.53.0.bb} (99%)

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/classes/meson.bbclass +0 -0
index 1ef34a999c8..1837c9468e6 100644
@@ -85,13 +85,16 @@ addtask write_config before do_configure

do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS

CXXFLAGS LDFLAGS"

Quoted 5 lines
Quoted 5 lines

meta/classes/meson.bbclass addtask write_config before do_configure

Quoted 5 lines

do_write_config() {
# This needs to be Py to split the args into single-element lists

meta/classes/meson.bbclass +3 -0
+
+    # Meson requires ld to be 'bfd, 'lld' or 'gold' from 0.53 onwards
+    #

https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3

Quoted 18 lines
Quoted 18 lines

meta/classes/meson.bbclass addtask write_config before do_configure · line 97

Quoted 8 lines
    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)}

meta/classes/meson.bbclass +1 -1
-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.

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

strip = ${@meson_array('STRIP', d)}
readelf = ${@meson_array('READELF', d)}
pkgconfig = 'pkg-config'

meta/classes/meson.bbclass +0 -0
@@ -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

Quoted 1 line
Quoted 1 line
Quoted 1 line

+ #

https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3

Quoted 6 lines
Quoted 6 lines

Review

Quoted 6 lines
meta/classes/meson.bbclass +2 -0
+    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"
(quoted diff) +0 -0

b/meta/recipes-devtools/meson/meson.inc

Quoted 4 lines
Quoted 4 lines

meta/recipes-devtools/meson/meson.inc SRC_URI = "

Quoted 4 lines

index 881a14c7f0a..c0ce7d338bc 100644

meta/recipes-devtools/meson/meson.inc +0 -0
@@ -17,8 +17,8 @@ SRC_URI = "

https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P

Quoted 1 line
Quoted 1 line
Quoted 1 line

file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \

Quoted 1 line
Quoted 1 line
Quoted 1 line

file://0001-modules-python.py-do-not-substitute-python-s-install.patch \

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
           "

-SRC_URI[sha256sum] =

"0c277472e49950a5537e3de3e60c57b80dbf425788470a1a8ed27446128fc035"

Quoted 2 lines
Quoted 2 lines

meta/recipes-devtools/meson/meson.inc

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +1 -1
-SRC_URI[md5sum] = "a5f0c99567d772508f649a28ded7f8ad"
+SRC_URI[sha256sum] =

"035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6"

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

+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

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

index d4264cee526..74d5b4ca66e 100644
---

a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch

Quoted 1 line
Quoted 1 line
Quoted 1 line

+++

b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch

Quoted 2 lines
Quoted 2 lines

meta/recipes-devtools/meson/meson.inc line 1

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +0 -1
@@ -1,4 +1,4 @@
-From cd980c763f11cfd928255346cc7e86f24add985e Mon Sep 17 00:00:00

2001

Quoted 1 line
Quoted 1 line

meta/recipes-devtools/meson/meson.inc line 1

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +1 -0
+From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00

2001

Quoted 15 lines
Quoted 15 lines
Quoted 15 lines

From: Ross Burton <[email protected]>
Date: Tue, 3 Jul 2018 13:59:09 +0100
Subject: [PATCH] Make CPU family warnings fatal

meta/recipes-devtools/meson/meson.inc +0 -0
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <[email protected]
 
 2 files changed, 2 insertions(+), 4 deletions(-)
 
mesonbuild/envconfig.py +1 -1
-index 29d7422..5fb00a4 100644
+index 0f277a7..24578ea 100644
mesonbuild/envconfig.py +1 -1
-@@ -190,7 +190,7 @@ class MachineInfo:
+@@ -192,7 +192,7 @@ class MachineInfo:
Quoted 11 lines
Quoted 11 lines

mesonbuild/environment.py

Quoted 11 lines

cpu_family = literal['cpu_family']
if cpu_family not in known_cpu_families:

mesonbuild/envconfig.py +0 -0
@@ -25,15 +25,15 @@ index 29d7422..5fb00a4 100644
         endian = literal['endian']
         if endian not in ('little', 'big'):
mesonbuild/environment.py +1 -1
-index a9bc2b8..b91c8da 100644
+index dc8b14f..3aab71e 100644
mesonbuild/environment.py +0 -1
-@@ -348,9 +348,7 @@ def detect_cpu_family(compilers: CompilersDict)

-> str:

Quoted 1 line
Quoted 1 line
Quoted 1 line

+@@ -354,9 +354,7 @@ def detect_cpu_family(compilers: CompilersDict)

-> str:

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

trial = 'parisc'

if trial not in known_cpu_families:
- mlog.warning('Unknown CPU family {!r}, please report this at

'

Quoted 1 line
Quoted 1 line
Quoted 1 line

-- '

https://github.com/mesonbuild/meson/issues/new with the'

Quoted 1 line
Quoted 1 line
Quoted 1 line

+- '

https://github.com/mesonbuild/meson/issues/new with the '

Quoted 1 line
Quoted 1 line
Quoted 1 line

- 'output of uname -a and `cat

/proc/cpuinfo`'.format(trial))

Quoted 1 line
Quoted 1 line
Quoted 1 line

+ raise EnvironmentException('Unknown CPU family %s, see

https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

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

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

index bf715d1e9f4..eb0e90dbdda 100644
---

a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch

Quoted 1 line
Quoted 1 line
Quoted 1 line

+++

b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch

Quoted 2 lines
Quoted 2 lines

mesonbuild/environment.py line 1

Quoted 2 lines
mesonbuild/environment.py +0 -1
@@ -1,4 +1,4 @@
-From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00

2001

Quoted 1 line
Quoted 1 line

mesonbuild/environment.py line 1

Quoted 1 line
mesonbuild/environment.py +1 -0
+From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00

2001

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

From: Alexander Kanavin <[email protected]>
Date: Mon, 19 Nov 2018 14:24:26 +0100
Subject: [PATCH] python module: do not manipulate the environment

when calling

Quoted 1 line
Quoted 1 line

mesonbuild/environment.py Signed-off-by: Alexander Kanavin <

Quoted 1 line
mesonbuild/environment.py +0 -0
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <

[email protected]>

Quoted 3 lines
Quoted 3 lines

Review

Quoted 3 lines
mesonbuild/environment.py +0 -0
 1 file changed, 12 deletions(-)
 
(quoted diff) +0 -0

b/mesonbuild/modules/python.py

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +1 -1
-index 9cfbd6f..3ff687a 100644
+index 07be318..b770603 100644
mesonbuild/modules/python.py +1 -1
-@@ -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')
Quoted 5 lines
Quoted 5 lines

mesonbuild/modules/python.py index 9cfbd6f..3ff687a 100644 · line 28

Quoted 5 lines
mesonbuild/modules/python.py +0 -3
@@ -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)

Quoted 1 line
Quoted 1 line

mesonbuild/modules/python.py index 9cfbd6f..3ff687a 100644 · line 29

Quoted 1 line
mesonbuild/modules/python.py +0 -1
-                     mlog.debug('Found "python-{}" via pkgconfig

lookup in LIBPC ({})'.format(pkg_version, pkg_libdir))

Quoted 2 lines
Quoted 2 lines

mesonbuild/modules/python.py index 9cfbd6f..3ff687a 100644 · line 31

Quoted 2 lines
mesonbuild/modules/python.py +0 -2
-@@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency):
-                     mlog.debug('"python-{}" could not be found in

LIBPC ({})'.format(pkg_version, pkg_libdir))

Quoted 1 line
Quoted 1 line

mesonbuild/modules/python.py index 9cfbd6f..3ff687a 100644 · line 26

Quoted 1 line
mesonbuild/modules/python.py +1 -0
+                     self.pkgdep = PkgConfigDependency(pkg_name,

environment, kwargs)

Quoted 1 line
Quoted 1 line

mesonbuild/modules/python.py index 9cfbd6f..3ff687a 100644 · line 27

Quoted 1 line
mesonbuild/modules/python.py +1 -0
+                     mlog.debug('Found "{}" via pkgconfig lookup in

LIBPC ({})'.format(pkg_name, pkg_libdir))

Quoted 2 lines
Quoted 2 lines

mesonbuild/modules/python.py index 9cfbd6f..3ff687a 100644 · line 29

Quoted 2 lines
mesonbuild/modules/python.py +2 -0
+@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
+                     mlog.debug('"{}" could not be found in LIBPC

({})'.format(pkg_name, pkg_libdir))

Quoted 8 lines
Quoted 8 lines

mesonbuild/modules/python.py index 9cfbd6f..3ff687a 100644 · line 42

Quoted 8 lines
mesonbuild/modules/python.py +0 -4
                     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))

Quoted 1 line
Quoted 1 line

mesonbuild/modules/python.py index 9cfbd6f..3ff687a 100644 · line 40

Quoted 1 line
mesonbuild/modules/python.py +1 -0
+                 mlog.debug('"{}" could not be found in LIBPC ({}),

this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir))

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

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

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

index c8c7b298de3..1529ebe9fea 100644
---

a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch

Quoted 1 line
Quoted 1 line
Quoted 1 line

+++

b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch

Quoted 2 lines
Quoted 2 lines

mesonbuild/modules/python.py line 1

Quoted 2 lines
mesonbuild/modules/python.py +0 -1
@@ -1,4 +1,4 @@
-From 4d223562c3e510e0dd62b608d184604e2cab6198 Mon Sep 17 00:00:00

2001

Quoted 1 line
Quoted 1 line

mesonbuild/modules/python.py line 1

Quoted 1 line
mesonbuild/modules/python.py +1 -0
+From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00

2001

Quoted 4 lines
Quoted 4 lines

mesonbuild/modules/python.py Signed-off-by: Peter Kjellerstedt <

Quoted 4 lines

From: Peter Kjellerstedt <[email protected]>
Date: Thu, 26 Jul 2018 16:32:49 +0200
Subject: [PATCH] Support building allarch recipes again

mesonbuild/modules/python.py +0 -0
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <

[email protected]>

Quoted 16 lines
Quoted 16 lines
Quoted 15 lines
mesonbuild/modules/python.py +0 -0
 1 file changed, 1 insertion(+)
 
mesonbuild/envconfig.py +1 -1
-index 5fb00a4..f5702ba 100644
+index 24578ea..216e71f 100644
mesonbuild/envconfig.py +2 -1
@@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
@@ -22,5 +22,5 @@ index 5fb00a4..f5702ba 100644
 known_cpu_families = (
+    'allarch',
     'aarch64',
+     'alpha',
     'arc',
-     'arm',
Quoted 1 line

diff --git

a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch

Quoted 5 lines
Quoted 5 lines

meta/recipes-devtools/meson/meson/0003-native_bindir.patch line 1

Quoted 5 lines

index 14a9a136664..76c1aa9ac1c 100644

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -1
@@ -1,4 +1,4 @@
-From baf7b94fec5a31b2d0cb162e43dbd28cc019f38e Mon Sep 17 00:00:00

2001

Quoted 1 line
Quoted 1 line

meta/recipes-devtools/meson/meson/0003-native_bindir.patch line 1

Quoted 1 line
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -0
+From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00

2001

Quoted 4 lines
Quoted 4 lines

meta/recipes-devtools/meson/meson/0003-native_bindir.patch Signed-off-by: Ricardo Ribalda Delgado <

Quoted 4 lines

From: Ricardo Ribalda Delgado <[email protected]>
Date: Wed, 15 Nov 2017 15:05:01 +0100
Subject: [PATCH] native_bindir

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
@@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <

[email protected]>

Quoted 3 lines
Quoted 3 lines

Review

Quoted 3 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
 2 files changed, 14 insertions(+), 11 deletions(-)
 
(quoted diff) +0 -0

b/mesonbuild/dependencies/base.py

Quoted 7 lines
Quoted 7 lines

mesonbuild/dependencies/base.py index 35f0175..b39cba6 100644 · line 43

Quoted 7 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -1
-index 35f0175..b39cba6 100644
+index f17b9f2..b5c9c92 100644
mesonbuild/dependencies/base.py +0 -0
@@ -184,7 +184,7 @@ class Dependency:
@@ -43,7 +43,7 @@ index 35f0175..b39cba6 100644
         raise DependencyException('Method "get_pkgconfig_variable()"

is '

Quoted 1 line
Quoted 1 line

mesonbuild/dependencies/base.py index 35f0175..b39cba6 100644 · line 44

Quoted 1 line
mesonbuild/dependencies/base.py +0 -0
                                   'invalid for an internal

dependency')

Quoted 4 lines
Quoted 4 lines

mesonbuild/dependencies/base.py index 35f0175..b39cba6 100644 · line 46

Quoted 4 lines
mesonbuild/dependencies/base.py +1 -1
-@@ -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,

Quoted 13 lines
Quoted 13 lines

mesonbuild/dependencies/base.py index 35f0175..b39cba6 100644 · line 73

Quoted 13 lines
mesonbuild/dependencies/base.py +2 -1
                         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)

Quoted 8 lines
Quoted 8 lines

mesonbuild/dependencies/base.py index 35f0175..b39cba6 100644 · line 79

Quoted 8 lines
mesonbuild/dependencies/base.py +2 -2
         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)

Quoted 9 lines
Quoted 9 lines

mesonbuild/dependencies/base.py index 35f0175..b39cba6 100644 · line 88

Quoted 9 lines
mesonbuild/dependencies/base.py +1 -1
@@ -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

Quoted 5 lines
Quoted 5 lines

Review

Quoted 5 lines
mesonbuild/dependencies/base.py +0 -0
@@ -93,7 +93,7 @@ index 35f0175..b39cba6 100644
         if ret != 0:
             if self.required:
(quoted diff) +0 -0

b/mesonbuild/dependencies/ui.py

Quoted 6 lines
Quoted 6 lines

Review

Quoted 6 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -1
-index 6d784e6..73a9e13 100644
+index bdcc4a7..e2de847 100644
mesonbuild/dependencies/ui.py +0 -0
@@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
(quoted diff) +0 -0

b/meta/recipes-devtools/meson/meson_0.53.0.bb

Quoted 4 lines
Quoted 4 lines

Review

Quoted 4 lines

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

(quoted diff) +0 -0

b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb

Quoted 23 lines
Quoted 23 lines
Quoted 23 lines

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

meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb +0 -0
@@ -31,7 +31,7 @@ c = @CC

cpp = @CXX
ar = @AR
nm = @NM

meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb +1 -1
-ld = @LD
+ld = 'bfd'

strip = @STRIP
pkgconfig = 'pkg-config'

--
2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

#11 lore raw

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

Quoted 376 lines · Alexander Kanavin

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

Alex

Quoted 369 lines · Khem Raj
Quoted 2 lines · Alexander Kanavin

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.

Quoted 1 line

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

Quoted 13 lines

Alex

Quoted 11 lines · Khem Raj
Quoted 7 lines · Alexander Kanavin

---

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

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

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

...-Support-building-allarch-recipes-again.patch | 6 +++---
.../meson/meson/0003-native_bindir.patch | 16

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

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

Quoted 1 line
Quoted 1 line
Quoted 1 line

rename meta/recipes-devtools/meson/{nativesdk-meson_0.52.1.bb =>

nativesdk-meson_0.53.0.bb} (99%)

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
meta/classes/meson.bbclass +0 -0
index 1ef34a999c8..1837c9468e6 100644
@@ -85,13 +85,16 @@ addtask write_config before do_configure

do_write_config[vardeps] += "CC CXX LD AR NM STRIP READELF CFLAGS

CXXFLAGS LDFLAGS"

Quoted 4 lines
Quoted 4 lines

meta/classes/meson.bbclass

Quoted 4 lines

do_write_config() {
# This needs to be Py to split the args into single-element lists

meta/classes/meson.bbclass +2 -0
+
+    # Meson requires ld to be 'bfd, 'lld' or 'gold' from 0.53

onwards

Quoted 1 line
Quoted 1 line
Quoted 1 line

+ #

https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3

Quoted 18 lines
Quoted 18 lines

meta/classes/meson.bbclass addtask write_config before do_configure · line 97

Quoted 8 lines
    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)}

meta/classes/meson.bbclass +1 -1
-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.

Quoted 8 lines
Quoted 8 lines
Quoted 8 lines

strip = ${@meson_array('STRIP', d)}
readelf = ${@meson_array('READELF', d)}
pkgconfig = 'pkg-config'

meta/classes/meson.bbclass +0 -0
@@ -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

Quoted 1 line
Quoted 1 line
Quoted 1 line

+ #

https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3

Quoted 6 lines
Quoted 6 lines

Review

Quoted 6 lines
meta/classes/meson.bbclass +2 -0
+    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"
(quoted diff) +0 -0

b/meta/recipes-devtools/meson/meson.inc

Quoted 4 lines
Quoted 4 lines

meta/recipes-devtools/meson/meson.inc SRC_URI = "

Quoted 4 lines

index 881a14c7f0a..c0ce7d338bc 100644

meta/recipes-devtools/meson/meson.inc +0 -0
@@ -17,8 +17,8 @@ SRC_URI = "

https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${P

Quoted 1 line
Quoted 1 line
Quoted 1 line

file://0001-mesonbuild-environment.py-check-environment-for-vari.patch \

Quoted 1 line
Quoted 1 line
Quoted 1 line

file://0001-modules-python.py-do-not-substitute-python-s-install.patch \

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
           "

-SRC_URI[sha256sum] =

"0c277472e49950a5537e3de3e60c57b80dbf425788470a1a8ed27446128fc035"

Quoted 2 lines
Quoted 2 lines

meta/recipes-devtools/meson/meson.inc

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +1 -1
-SRC_URI[md5sum] = "a5f0c99567d772508f649a28ded7f8ad"
+SRC_URI[sha256sum] =

"035e75993ab6fa6c9ebf902b835c64cf397a763eb8e65c9bb6e1cc9730a9d3f6"

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines

+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

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

index d4264cee526..74d5b4ca66e 100644
---

a/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch

Quoted 1 line
Quoted 1 line
Quoted 1 line

+++

b/meta/recipes-devtools/meson/meson/0001-Make-CPU-family-warnings-fatal.patch

Quoted 2 lines
Quoted 2 lines

meta/recipes-devtools/meson/meson.inc line 1

Quoted 2 lines
meta/recipes-devtools/meson/meson.inc +0 -1
@@ -1,4 +1,4 @@
-From cd980c763f11cfd928255346cc7e86f24add985e Mon Sep 17 00:00:00

2001

Quoted 1 line
Quoted 1 line

meta/recipes-devtools/meson/meson.inc line 1

Quoted 1 line
meta/recipes-devtools/meson/meson.inc +1 -0
+From 8ce7a1ddbc9b7775568a98fcd50e39a01513c902 Mon Sep 17 00:00:00

2001

Quoted 4 lines
Quoted 4 lines

meta/recipes-devtools/meson/meson.inc Signed-off-by: Ross Burton <

Quoted 4 lines

From: Ross Burton <[email protected]>
Date: Tue, 3 Jul 2018 13:59:09 +0100
Subject: [PATCH] Make CPU family warnings fatal

meta/recipes-devtools/meson/meson.inc +0 -0
@@ -12,10 +12,10 @@ Signed-off-by: Ross Burton <

[email protected]>

Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
meta/recipes-devtools/meson/meson.inc +0 -0
 2 files changed, 2 insertions(+), 4 deletions(-)
 
mesonbuild/envconfig.py +1 -1
-index 29d7422..5fb00a4 100644
+index 0f277a7..24578ea 100644
mesonbuild/envconfig.py +1 -1
-@@ -190,7 +190,7 @@ class MachineInfo:
+@@ -192,7 +192,7 @@ class MachineInfo:
Quoted 11 lines
Quoted 11 lines

mesonbuild/environment.py

Quoted 11 lines

cpu_family = literal['cpu_family']
if cpu_family not in known_cpu_families:

mesonbuild/envconfig.py +0 -0
@@ -25,15 +25,15 @@ index 29d7422..5fb00a4 100644
         endian = literal['endian']
         if endian not in ('little', 'big'):
mesonbuild/environment.py +1 -1
-index a9bc2b8..b91c8da 100644
+index dc8b14f..3aab71e 100644
mesonbuild/environment.py +0 -1
-@@ -348,9 +348,7 @@ def detect_cpu_family(compilers: CompilersDict)

-> str:

Quoted 1 line
Quoted 1 line
Quoted 1 line

+@@ -354,9 +354,7 @@ def detect_cpu_family(compilers: CompilersDict)

-> str:

Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

trial = 'parisc'

if trial not in known_cpu_families:
- mlog.warning('Unknown CPU family {!r}, please report this

at '

Quoted 1 line
Quoted 1 line
Quoted 1 line

-- '

https://github.com/mesonbuild/meson/issues/new with the'

Quoted 1 line
Quoted 1 line
Quoted 1 line

+- '

https://github.com/mesonbuild/meson/issues/new with the '

Quoted 1 line
Quoted 1 line
Quoted 1 line

- 'output of uname -a and `cat

/proc/cpuinfo`'.format(trial))

Quoted 1 line
Quoted 1 line
Quoted 1 line

+ raise EnvironmentException('Unknown CPU family %s, see

https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

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

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

index bf715d1e9f4..eb0e90dbdda 100644
---

a/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch

Quoted 1 line
Quoted 1 line
Quoted 1 line

+++

b/meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch

Quoted 2 lines
Quoted 2 lines

mesonbuild/environment.py line 1

Quoted 2 lines
mesonbuild/environment.py +0 -1
@@ -1,4 +1,4 @@
-From 3cb2c811dc6d4890342afa5b709cd30cf7b8f3ca Mon Sep 17 00:00:00

2001

Quoted 1 line
Quoted 1 line

mesonbuild/environment.py line 1

Quoted 1 line
mesonbuild/environment.py +1 -0
+From 689e28c49b85311f93f39df70cbee702fc44afb6 Mon Sep 17 00:00:00

2001

Quoted 3 lines
Quoted 3 lines
Quoted 3 lines

From: Alexander Kanavin <[email protected]>
Date: Mon, 19 Nov 2018 14:24:26 +0100
Subject: [PATCH] python module: do not manipulate the environment

when calling

Quoted 1 line
Quoted 1 line

mesonbuild/environment.py Signed-off-by: Alexander Kanavin <

Quoted 1 line
mesonbuild/environment.py +0 -0
@@ -12,10 +12,10 @@ Signed-off-by: Alexander Kanavin <

[email protected]>

Quoted 3 lines
Quoted 3 lines

Review

Quoted 3 lines
mesonbuild/environment.py +0 -0
 1 file changed, 12 deletions(-)
 
(quoted diff) +0 -0

b/mesonbuild/modules/python.py

Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
meta/recipes-devtools/meson/meson/0001-python-module-do-not-manipulate-the-environment-when.patch +1 -1
-index 9cfbd6f..3ff687a 100644
+index 07be318..b770603 100644
mesonbuild/modules/python.py +1 -1
-@@ -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')
Quoted 5 lines
Quoted 5 lines

mesonbuild/modules/python.py index 9cfbd6f..3ff687a 100644 · line 28

Quoted 5 lines
mesonbuild/modules/python.py +0 -3
@@ -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)

Quoted 1 line
Quoted 1 line

mesonbuild/modules/python.py index 9cfbd6f..3ff687a 100644 · line 29

Quoted 1 line
mesonbuild/modules/python.py +0 -1
-                     mlog.debug('Found "python-{}" via pkgconfig

lookup in LIBPC ({})'.format(pkg_version, pkg_libdir))

Quoted 2 lines
Quoted 2 lines

mesonbuild/modules/python.py index 9cfbd6f..3ff687a 100644 · line 31

Quoted 2 lines
mesonbuild/modules/python.py +0 -2
-@@ -88,13 +83,6 @@ class PythonDependency(ExternalDependency):
-                     mlog.debug('"python-{}" could not be found in

LIBPC ({})'.format(pkg_version, pkg_libdir))

Quoted 1 line
Quoted 1 line

mesonbuild/modules/python.py index 9cfbd6f..3ff687a 100644 · line 26

Quoted 1 line
mesonbuild/modules/python.py +1 -0
+                     self.pkgdep = PkgConfigDependency(pkg_name,

environment, kwargs)

Quoted 1 line
Quoted 1 line

mesonbuild/modules/python.py index 9cfbd6f..3ff687a 100644 · line 27

Quoted 1 line
mesonbuild/modules/python.py +1 -0
+                     mlog.debug('Found "{}" via pkgconfig lookup in

LIBPC ({})'.format(pkg_name, pkg_libdir))

Quoted 2 lines
Quoted 2 lines

mesonbuild/modules/python.py index 9cfbd6f..3ff687a 100644 · line 29

Quoted 2 lines
mesonbuild/modules/python.py +2 -0
+@@ -84,13 +79,6 @@ class PythonDependency(ExternalDependency):
+                     mlog.debug('"{}" could not be found in LIBPC

({})'.format(pkg_name, pkg_libdir))

Quoted 8 lines
Quoted 8 lines

mesonbuild/modules/python.py index 9cfbd6f..3ff687a 100644 · line 42

Quoted 8 lines
mesonbuild/modules/python.py +0 -4
                     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))

Quoted 1 line
Quoted 1 line

mesonbuild/modules/python.py index 9cfbd6f..3ff687a 100644 · line 40

Quoted 1 line
mesonbuild/modules/python.py +1 -0
+                 mlog.debug('"{}" could not be found in LIBPC ({}),

this is likely due to a relocated python installation'.format(pkg_name, pkg_libdir))

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

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

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

index c8c7b298de3..1529ebe9fea 100644
---

a/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch

Quoted 1 line
Quoted 1 line
Quoted 1 line

+++

b/meta/recipes-devtools/meson/meson/0002-Support-building-allarch-recipes-again.patch

Quoted 2 lines
Quoted 2 lines

mesonbuild/modules/python.py line 1

Quoted 2 lines
mesonbuild/modules/python.py +0 -1
@@ -1,4 +1,4 @@
-From 4d223562c3e510e0dd62b608d184604e2cab6198 Mon Sep 17 00:00:00

2001

Quoted 1 line
Quoted 1 line

mesonbuild/modules/python.py line 1

Quoted 1 line
mesonbuild/modules/python.py +1 -0
+From cc6e47da801ce3c274485775c62784416fd22977 Mon Sep 17 00:00:00

2001

Quoted 4 lines
Quoted 4 lines

mesonbuild/modules/python.py Signed-off-by: Peter Kjellerstedt <

Quoted 4 lines

From: Peter Kjellerstedt <[email protected]>
Date: Thu, 26 Jul 2018 16:32:49 +0200
Subject: [PATCH] Support building allarch recipes again

mesonbuild/modules/python.py +0 -0
@@ -13,7 +13,7 @@ Signed-off-by: Peter Kjellerstedt <

[email protected]>

Quoted 16 lines
Quoted 16 lines
Quoted 15 lines
mesonbuild/modules/python.py +0 -0
 1 file changed, 1 insertion(+)
 
mesonbuild/envconfig.py +1 -1
-index 5fb00a4..f5702ba 100644
+index 24578ea..216e71f 100644
mesonbuild/envconfig.py +2 -1
@@ -36,6 +36,7 @@ _T = typing.TypeVar('_T')
@@ -22,5 +22,5 @@ index 5fb00a4..f5702ba 100644
 known_cpu_families = (
+    'allarch',
     'aarch64',
+     'alpha',
     'arc',
-     'arm',
Quoted 1 line

diff --git

a/meta/recipes-devtools/meson/meson/0003-native_bindir.patch b/meta/recipes-devtools/meson/meson/0003-native_bindir.patch

Quoted 5 lines
Quoted 5 lines

meta/recipes-devtools/meson/meson/0003-native_bindir.patch line 1

Quoted 5 lines

index 14a9a136664..76c1aa9ac1c 100644

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -1
@@ -1,4 +1,4 @@
-From baf7b94fec5a31b2d0cb162e43dbd28cc019f38e Mon Sep 17 00:00:00

2001

Quoted 1 line
Quoted 1 line

meta/recipes-devtools/meson/meson/0003-native_bindir.patch line 1

Quoted 1 line
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -0
+From af2554b9b08af973181b4e4181bd1cb936fdbb8f Mon Sep 17 00:00:00

2001

Quoted 4 lines
Quoted 4 lines

meta/recipes-devtools/meson/meson/0003-native_bindir.patch Signed-off-by: Ricardo Ribalda Delgado <

Quoted 4 lines

From: Ricardo Ribalda Delgado <[email protected]>
Date: Wed, 15 Nov 2017 15:05:01 +0100
Subject: [PATCH] native_bindir

meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
@@ -22,7 +22,7 @@ Signed-off-by: Ricardo Ribalda Delgado <

[email protected]>

Quoted 3 lines
Quoted 3 lines

Review

Quoted 3 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +0 -0
 2 files changed, 14 insertions(+), 11 deletions(-)
 
(quoted diff) +0 -0

b/mesonbuild/dependencies/base.py

Quoted 7 lines
Quoted 7 lines

mesonbuild/dependencies/base.py index 35f0175..b39cba6 100644 · line 43

Quoted 7 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -1
-index 35f0175..b39cba6 100644
+index f17b9f2..b5c9c92 100644
mesonbuild/dependencies/base.py +0 -0
@@ -184,7 +184,7 @@ class Dependency:
@@ -43,7 +43,7 @@ index 35f0175..b39cba6 100644
         raise DependencyException('Method

"get_pkgconfig_variable()" is '

Quoted 1 line
Quoted 1 line

mesonbuild/dependencies/base.py index 35f0175..b39cba6 100644 · line 44

Quoted 1 line
mesonbuild/dependencies/base.py +0 -0
                                   'invalid for an internal

dependency')

Quoted 4 lines
Quoted 4 lines

mesonbuild/dependencies/base.py index 35f0175..b39cba6 100644 · line 46

Quoted 4 lines
mesonbuild/dependencies/base.py +1 -1
-@@ -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,

Quoted 13 lines
Quoted 13 lines

mesonbuild/dependencies/base.py index 35f0175..b39cba6 100644 · line 73

Quoted 13 lines
mesonbuild/dependencies/base.py +2 -1
                         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)

Quoted 8 lines
Quoted 8 lines

mesonbuild/dependencies/base.py index 35f0175..b39cba6 100644 · line 79

Quoted 8 lines
mesonbuild/dependencies/base.py +2 -2
         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)

Quoted 9 lines
Quoted 9 lines

mesonbuild/dependencies/base.py index 35f0175..b39cba6 100644 · line 88

Quoted 9 lines
mesonbuild/dependencies/base.py +1 -1
@@ -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

Quoted 5 lines
Quoted 5 lines

Review

Quoted 5 lines
mesonbuild/dependencies/base.py +0 -0
@@ -93,7 +93,7 @@ index 35f0175..b39cba6 100644
         if ret != 0:
             if self.required:
(quoted diff) +0 -0

b/mesonbuild/dependencies/ui.py

Quoted 6 lines
Quoted 6 lines

Review

Quoted 6 lines
meta/recipes-devtools/meson/meson/0003-native_bindir.patch +1 -1
-index 6d784e6..73a9e13 100644
+index bdcc4a7..e2de847 100644
mesonbuild/dependencies/ui.py +0 -0
@@ -330,7 +330,7 @@ class QtBaseDependency(ExternalDependency):
(quoted diff) +0 -0

b/meta/recipes-devtools/meson/meson_0.53.0.bb

Quoted 4 lines
Quoted 4 lines

Review

Quoted 4 lines

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

(quoted diff) +0 -0

b/meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb

Quoted 23 lines
Quoted 23 lines
Quoted 23 lines

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

meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb +0 -0
@@ -31,7 +31,7 @@ c = @CC

cpp = @CXX
ar = @AR
nm = @NM

meta/recipes-devtools/meson/nativesdk-meson_0.53.0.bb renamed from meta/recipes-devtools/meson/nativesdk-meson_0.52.1.bb +1 -1
-ld = @LD
+ld = 'bfd'

strip = @STRIP
pkgconfig = 'pkg-config'

--
2.17.1

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core