Re: [OE-core] [PATCH] meson: upgrade 0.60.3 -> 0.61.0

[Alexander Kanavin <alex.kanavin@gmail.com>]

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

Please hold this off, I have a 0.61.1 patch.

Alex

On Mon, 17 Jan 2022 at 15:31, wangmy <wangmy@fujitsu.com> wrote:

> 0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
> removed since it is included in 0.61.0
>
> Changelog:
> ==========
> backend_startup_project will no longer erase the last project in a VS
> solution
> if it is not the specified project.
>
> Previously the Windows module only accepted CustomTargets with one output,
> it now accepts them with more than one output, and creates a windows
> resource
> target for each output. Additionally it now accepts indexes of
> CustomTargets
>
> Add a man page backend to refman
>
> extract_objects() supports generated sources
>
> Python 3.6 support will be dropped in the next release
>
> Warning if check kwarg of run_command is missing
>
> meson rewrite can modify extra_files
>
> meson rewrite target <target> info outputs target's extra_files
>
> As Visual Studio 2022 is released recently, it's time to support the new
> version
> in Meson. This mainly includes the new "v143" platform tools.
>
> Support for CMake <3.14 is now deprecated for CMake subprojects
>
> Added support for sccache
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
>  meta/recipes-devtools/meson/meson.inc         |  3 +-
>  ...sues-that-arise-when-cross-compiling.patch | 39 -------------------
>  .../{meson_0.60.3.bb => meson_0.61.0.bb}      |  0
>  ...on_0.60.3.bb => nativesdk-meson_0.61.0.bb} |  0
>  4 files changed, 1 insertion(+), 41 deletions(-)
>  delete mode 100644
> meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
>  rename meta/recipes-devtools/meson/{meson_0.60.3.bb => meson_0.61.0.bb}
> (100%)
>  rename meta/recipes-devtools/meson/{nativesdk-meson_0.60.3.bb =>
> nativesdk-meson_0.61.0.bb} (100%)
>
> diff --git a/meta/recipes-devtools/meson/meson.inc
> b/meta/recipes-devtools/meson/meson.inc
> index 042cf130e4..452b0c18ee 100644
> --- a/meta/recipes-devtools/meson/meson.inc
> +++ b/meta/recipes-devtools/meson/meson.inc
> @@ -8,14 +8,13 @@ LICENSE = "Apache-2.0"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
>
>  SRC_URI = "
> https://github.com/mesonbuild/meson/releases/download/${PV}/meson-${PV}.tar.gz
> \
> -
>  file://0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch \
>
> file://0001-python-module-do-not-manipulate-the-environment-when.patch \
>             file://disable-rpath-handling.patch \
>             file://0001-Make-CPU-family-warnings-fatal.patch \
>             file://0002-Support-building-allarch-recipes-again.patch \
>             file://0001-is_debianlike-always-return-False.patch \
>             "
> -SRC_URI[sha256sum] =
> "87ca5fa9358a01864529392bd64e027158eb94afca7c7766b1866ef27eccb98e"
> +SRC_URI[sha256sum] =
> "ea9f33246b1f23f02e90a50e75e0f41e526f6dabf0c24f3e00e27a3f5abdc35c"
>
>  UPSTREAM_CHECK_URI = "https://github.com/mesonbuild/meson/releases"
>  UPSTREAM_CHECK_REGEX = "meson-(?P<pver>\d+(\.\d+)+)\.tar"
> diff --git
> a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
> b/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
> deleted file mode 100644
> index b098c4a123..0000000000
> ---
> a/meta/recipes-devtools/meson/meson/0001-gtkdoc-fix-issues-that-arise-when-cross-compiling.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -From bbdd6679e49bcba5ec022b240ac234a87b451e41 Mon Sep 17 00:00:00 2001
> -From: Alexander Kanavin <alex.kanavin@gmail.com>
> -Date: Fri, 4 Aug 2017 16:16:41 +0300
> -Subject: [PATCH] gtkdoc: add support for a binary wrapper
> -
> -Make it possible to specify a wrapper for executing binaries
> -in cross-compiling scenarios.
> -(usually, some kind of target hardware emulator, such as qemu)
> -
> -Upstream-Status: Submitted [https://github.com/mesonbuild/meson/pull/9627
> ]
> -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> -
> ----
> - mesonbuild/modules/gnome.py | 5 ++++-
> - 1 file changed, 4 insertions(+), 1 deletion(-)
> -
> -diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
> -index 1c6952d..5a6ff94 100644
> ---- a/mesonbuild/modules/gnome.py
> -+++ b/mesonbuild/modules/gnome.py
> -@@ -35,7 +35,7 @@ from ..mesonlib import (
> - from ..dependencies import Dependency, PkgConfigDependency,
> InternalDependency
> - from ..interpreterbase import noPosargs, noKwargs, permittedKwargs,
> FeatureNew, FeatureNewKwargs, FeatureDeprecatedKwargs, FeatureDeprecated
> - from ..interpreterbase import typed_kwargs, KwargInfo, ContainerTypeInfo
> --from ..programs import ExternalProgram, OverrideProgram
> -+from ..programs import ExternalProgram, OverrideProgram,
> EmptyExternalProgram
> - from ..build import CustomTarget, CustomTargetIndex, GeneratedList
> -
> - if T.TYPE_CHECKING:
> -@@ -1103,6 +1103,9 @@ class GnomeModule(ExtensionModule):
> -             args.append(f'--{program_name}={path}')
> -         if namespace:
> -             args.append('--namespace=' + namespace)
> -+        if state.environment.need_exe_wrapper() and not
> isinstance(state.environment.get_exe_wrapper(), EmptyExternalProgram):
> -+            args.append('--run=' + '
> '.join(state.environment.get_exe_wrapper().get_command()))
> -+
> -         args += self._unpack_args('--htmlargs=', 'html_args', kwargs)
> -         args += self._unpack_args('--scanargs=', 'scan_args', kwargs)
> -         args += self._unpack_args('--scanobjsargs=', 'scanobjs_args',
> kwargs)
> diff --git a/meta/recipes-devtools/meson/meson_0.60.3.bb
> b/meta/recipes-devtools/meson/meson_0.61.0.bb
> similarity index 100%
> rename from meta/recipes-devtools/meson/meson_0.60.3.bb
> rename to meta/recipes-devtools/meson/meson_0.61.0.bb
> diff --git a/meta/recipes-devtools/meson/nativesdk-meson_0.60.3.bb
> b/meta/recipes-devtools/meson/nativesdk-meson_0.61.0.bb
> similarity index 100%
> rename from meta/recipes-devtools/meson/nativesdk-meson_0.60.3.bb
> rename to meta/recipes-devtools/meson/nativesdk-meson_0.61.0.bb
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#160647):
> https://lists.openembedded.org/g/openembedded-core/message/160647
> Mute This Topic: https://lists.openembedded.org/mt/88484714/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>

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