meson: upgraded package to upstream
Upgraded dev-util/meson to version 0.55.3 on amd64
BUG=chromium:1162252
TEST=./build_packages --board=${BOARD} and CQ passes
Change-Id: I9276fdde34f336da95d583a0e6545b6c720ceb08
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2606384
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Tested-by: Allen Webb <allenwebb@google.com>
Commit-Queue: Allen Webb <allenwebb@google.com>
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 1b49d21..56d8beb 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1 +1 @@
-DIST meson-0.54.2.tar.gz 1691270 BLAKE2B c1ba552b5d56e0b6b73de46ec6bc90fb520665688d2f5c809baf84749d3bb1dec1fe0131136e1539369fa666ae2427c8fccd5928cbda0b8e3e1edb4a5dc8abbc SHA512 ad5ec826879d3d85088ca40d768599a4c8e66983f2a6a7ebe8ab12051cad18b4ade9a2afd30fe543b0a75900822992c8ef7161d369489e2211dd7a1a8ccc32ed
+DIST meson-0.55.3.tar.gz 1740465 BLAKE2B 7d121f5d2bf487ae3c38be5ddccde6900134b9d0ea47868aac5625449e18a1a97ae0012849b795187221632cd3ac343097ef29b282753a1e8bd871c393d5c0e8 SHA512 afb0bb25b367e681131d920995124df4b06f6d144ae1a95ebec27be13e06fefbd95840e0287cd1d84bdbb8d9c115b589a833d847c60926f55e0f15749cf66bae
diff --git a/dev-util/meson/files/0.54.2-multilib-clang.patch b/dev-util/meson/files/0.54.2-multilib-clang.patch
deleted file mode 100644
index b3aa369..0000000
--- a/dev-util/meson/files/0.54.2-multilib-clang.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From 9dc3ca2c1c9fbb47e731551c6432df144f725261 Mon Sep 17 00:00:00 2001
-From: Yevhenii Kolesnikov <yevhenii.kolesnikov@globallogic.com>
-Date: Thu, 21 May 2020 18:58:47 +0300
-Subject: [PATCH] compilers: add fetching of define list for clang
-
-Simmilar to gcc, the list of pre-processor defines can be fetched with
-`-dM -E` option. The way cpu_family is determined on linux relies on
-this list.
-
-Fixes incorrect value of cpu_family on linux, when crosscompiling:
-
-```
-CC="clang -m32" meson ./build
-```
-
-Signed-off-by: Yevhenii Kolesnikov <yevhenii.kolesnikov@globallogic.com>
-Co-authored-by: Dylan Baker <dylan@pnwbakers.com>
----
- mesonbuild/compilers/c.py | 5 +++--
- mesonbuild/compilers/cpp.py | 5 +++--
- mesonbuild/compilers/fortran.py | 2 +-
- mesonbuild/compilers/mixins/clang.py | 9 ++++++++-
- mesonbuild/compilers/objc.py | 2 +-
- mesonbuild/compilers/objcpp.py | 2 +-
- mesonbuild/environment.py | 26 +++++++++++++++++++++++++-
- 7 files changed, 42 insertions(+), 9 deletions(-)
-
-diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
-index 1bc9e84998..aac99b4269 100644
---- a/mesonbuild/compilers/c.py
-+++ b/mesonbuild/compilers/c.py
-@@ -86,9 +86,10 @@ class ClangCCompiler(ClangCompiler, CCompiler):
- _C18_VERSION = '>=8.0.0'
-
- def __init__(self, exelist, version, for_machine: MachineChoice,
-- is_cross, info: 'MachineInfo', exe_wrapper=None, **kwargs):
-+ is_cross, info: 'MachineInfo', exe_wrapper=None,
-+ defines: T.Optional[T.List[str]] = None, **kwargs):
- CCompiler.__init__(self, exelist, version, for_machine, is_cross, info, exe_wrapper, **kwargs)
-- ClangCompiler.__init__(self)
-+ ClangCompiler.__init__(self, defines)
- default_warn_args = ['-Wall', '-Winvalid-pch']
- self.warn_args = {'0': [],
- '1': default_warn_args,
-diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
-index f4bcfa9f89..478a68c13c 100644
---- a/mesonbuild/compilers/cpp.py
-+++ b/mesonbuild/compilers/cpp.py
-@@ -155,10 +155,11 @@ def _find_best_cpp_std(self, cpp_std):
-
- class ClangCPPCompiler(ClangCompiler, CPPCompiler):
- def __init__(self, exelist, version, for_machine: MachineChoice,
-- is_cross, info: 'MachineInfo', exe_wrapper=None, **kwargs):
-+ is_cross, info: 'MachineInfo', exe_wrapper=None,
-+ defines : T.Optional[T.List[str]] = None, **kwargs):
- CPPCompiler.__init__(self, exelist, version, for_machine, is_cross,
- info, exe_wrapper, **kwargs)
-- ClangCompiler.__init__(self)
-+ ClangCompiler.__init__(self, defines)
- default_warn_args = ['-Wall', '-Winvalid-pch', '-Wnon-virtual-dtor']
- self.warn_args = {'0': [],
- '1': default_warn_args,
-diff --git a/mesonbuild/compilers/fortran.py b/mesonbuild/compilers/fortran.py
-index c155b5b4f3..af83c0e564 100644
---- a/mesonbuild/compilers/fortran.py
-+++ b/mesonbuild/compilers/fortran.py
-@@ -424,7 +424,7 @@ def __init__(self, exelist, version, for_machine: MachineChoice,
- **kwargs):
- FortranCompiler.__init__(self, exelist, version, for_machine,
- is_cross, info, exe_wrapper, **kwargs)
-- ClangCompiler.__init__(self)
-+ ClangCompiler.__init__(self, [])
- self.id = 'flang'
- default_warn_args = ['-Minform=inform']
- self.warn_args = {'0': [],
-diff --git a/mesonbuild/compilers/mixins/clang.py b/mesonbuild/compilers/mixins/clang.py
-index 1c0ee452f4..0ee10ad5d5 100644
---- a/mesonbuild/compilers/mixins/clang.py
-+++ b/mesonbuild/compilers/mixins/clang.py
-@@ -42,9 +42,10 @@
- } # type: T.Dict[str, T.List[str]]
-
- class ClangCompiler(GnuLikeCompiler):
-- def __init__(self):
-+ def __init__(self, defines: T.Optional[T.Dict[str, str]]):
- super().__init__()
- self.id = 'clang'
-+ self.defines = defines or {}
- self.base_options.append('b_colorout')
- # TODO: this really should be part of the linker base_options, but
- # linkers don't have base_options.
-@@ -56,6 +57,12 @@ def __init__(self):
- def get_colorout_args(self, colortype: str) -> T.List[str]:
- return clang_color_args[colortype][:]
-
-+ def has_builtin_define(self, define: str) -> bool:
-+ return define in self.defines
-+
-+ def get_builtin_define(self, define: str) -> T.Optional[str]:
-+ return self.defines.get(define)
-+
- def get_optimization_args(self, optimization_level: str) -> T.List[str]:
- return clang_optimization_args[optimization_level]
-
-diff --git a/mesonbuild/compilers/objc.py b/mesonbuild/compilers/objc.py
-index 52d258dcdb..d351c8826a 100644
---- a/mesonbuild/compilers/objc.py
-+++ b/mesonbuild/compilers/objc.py
-@@ -86,7 +86,7 @@ def __init__(self, exelist, version, for_machine: MachineChoice,
- **kwargs):
- ObjCCompiler.__init__(self, exelist, version, for_machine, is_cross,
- info, exe_wrapper, **kwargs)
-- ClangCompiler.__init__(self)
-+ ClangCompiler.__init__(self, [])
- default_warn_args = ['-Wall', '-Winvalid-pch']
- self.warn_args = {'0': [],
- '1': default_warn_args,
-diff --git a/mesonbuild/compilers/objcpp.py b/mesonbuild/compilers/objcpp.py
-index c8b422b35d..10555b4551 100644
---- a/mesonbuild/compilers/objcpp.py
-+++ b/mesonbuild/compilers/objcpp.py
-@@ -84,7 +84,7 @@ def __init__(self, exelist, version, for_machine: MachineChoice,
- is_cross, info: 'MachineInfo', exe_wrapper=None,
- **kwargs):
- ObjCPPCompiler.__init__(self, exelist, version, for_machine, is_cross, info, exe_wrapper, **kwargs)
-- ClangCompiler.__init__(self)
-+ ClangCompiler.__init__(self, [])
- default_warn_args = ['-Wall', '-Winvalid-pch', '-Wnon-virtual-dtor']
- self.warn_args = {'0': [],
- '1': default_warn_args,
-diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
-index 8fad6288b1..cb6ae7d514 100644
---- a/mesonbuild/environment.py
-+++ b/mesonbuild/environment.py
-@@ -726,6 +726,28 @@ def get_lcc_version_from_defines(defines):
- minor = defines.get('__LCC_MINOR__', '0')
- return dot.join((generation, major, minor))
-
-+ @staticmethod
-+ def get_clang_compiler_defines(compiler):
-+ """
-+ Get the list of Clang pre-processor defines
-+ """
-+ args = compiler + ['-E', '-dM', '-']
-+ p, output, error = Popen_safe(args, write='', stdin=subprocess.PIPE)
-+ if p.returncode != 0:
-+ raise EnvironmentException('Unable to get clang pre-processor defines:\n' + output + error)
-+ defines = {}
-+ for line in output.split('\n'):
-+ if not line:
-+ continue
-+ d, *rest = line.split(' ', 2)
-+ if d != '#define':
-+ continue
-+ if len(rest) == 1:
-+ defines[rest] = True
-+ if len(rest) == 2:
-+ defines[rest[0]] = rest[1]
-+ return defines
-+
- def _get_compilers(self, lang, for_machine):
- '''
- The list of compilers is detected in the exact same way for
-@@ -1043,6 +1065,8 @@ def sanitize(p):
- if 'clang' in out:
- linker = None
-
-+ defines = self.get_clang_compiler_defines(compiler)
-+
- # Even if the for_machine is darwin, we could be using vanilla
- # clang.
- if 'Apple' in out:
-@@ -1063,7 +1087,7 @@ def sanitize(p):
-
- return cls(
- ccache + compiler, version, for_machine, is_cross, info,
-- exe_wrap, full_version=full_version, linker=linker)
-+ exe_wrap, defines, full_version=full_version, linker=linker)
-
- if 'Intel(R) C++ Intel(R)' in err:
- version = search_version(err)
diff --git a/dev-util/meson/meson-0.54.2.ebuild b/dev-util/meson/meson-0.55.3.ebuild
similarity index 95%
rename from dev-util/meson/meson-0.54.2.ebuild
rename to dev-util/meson/meson-0.55.3.ebuild
index f4fcf8e..d60e981 100644
--- a/dev-util/meson/meson-0.54.2.ebuild
+++ b/dev-util/meson/meson-0.55.3.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
DISTUTILS_USE_SETUPTOOLS="rdepend"
if [[ ${PV} = *9999* ]]; then
@@ -34,10 +34,6 @@
)
"
-PATCHES=(
- "${FILESDIR}"/0.54.2-multilib-clang.patch
-)
-
python_prepare_all() {
local disable_unittests=(
# ASAN and sandbox both want control over LD_PRELOAD
diff --git a/metadata/md5-cache/dev-util/meson-0.54.2 b/metadata/md5-cache/dev-util/meson-0.54.2
deleted file mode 100644
index 8b9c1f9..0000000
--- a/metadata/md5-cache/dev-util/meson-0.54.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig )
-DESCRIPTION=Open source build system
-EAPI=7
-HOMEPAGE=https://mesonbuild.com/
-IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8
-KEYWORDS=*
-LICENSE=Apache-2.0
-RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-)]
-REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/meson/meson-0.54.2.tar.gz
-_eclasses_=distutils-r1 198e3b9ddb55ae36b2a50b07ca2877ef multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 79e26ce8f853c9daebe9a4956e37cc1b python-utils-r1 157a6a7a3e99c7dbdf81acc9dd4f57cd toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=67d8692bd5fc0284749ed4b9b961034f
diff --git a/metadata/md5-cache/dev-util/meson-0.55.3 b/metadata/md5-cache/dev-util/meson-0.55.3
new file mode 100644
index 0000000..9a0e38e
--- /dev/null
+++ b/metadata/md5-cache/dev-util/meson-0.55.3
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig )
+DESCRIPTION=Open source build system
+EAPI=7
+HOMEPAGE=https://mesonbuild.com/
+IUSE=test python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9
+KEYWORDS=*
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)] dev-python/setuptools[python_targets_python3_6(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_6(-),-python_single_target_python3_7(-),-python_single_target_python3_8(-),-python_single_target_python3_9(-)]
+REQUIRED_USE=|| ( python_targets_python3_6 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/m/meson/meson-0.55.3.tar.gz
+_eclasses_=distutils-r1 198e3b9ddb55ae36b2a50b07ca2877ef multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing e32940a7b2a9992ad217eccddb84d548 python-r1 79e26ce8f853c9daebe9a4956e37cc1b python-utils-r1 157a6a7a3e99c7dbdf81acc9dd4f57cd toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=2cc64a5042f5512d5a99597aede12e93
