Update to 0.47.2
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko
parent
d715e30e89
commit
b6ac8de56f
1
.gitignore
vendored
1
.gitignore
vendored
@ -46,3 +46,4 @@
|
||||
/meson-0.46.1.tar.gz
|
||||
/meson-0.47.0.tar.gz
|
||||
/meson-0.47.1.tar.gz
|
||||
/meson-0.47.2.tar.gz
|
||||
|
||||
@ -1,71 +0,0 @@
|
||||
From 7d25a2d488f56876988ed6cb648f4d65a7ef5ce1 Mon Sep 17 00:00:00 2001
|
||||
From: Nirbheek Chauhan <nirbheek@centricular.com>
|
||||
Date: Wed, 25 Jul 2018 18:33:53 +0530
|
||||
Subject: [PATCH 4/5] Add a feature-new entry for UserFeatureOption
|
||||
|
||||
Since we can't detect it in meson_options.txt, detect it when the
|
||||
option is used.
|
||||
|
||||
(cherry picked from commit 0ea21d7aea28c56f37fc37bda31031a6ecb5d6ae)
|
||||
---
|
||||
mesonbuild/interpreter.py | 11 ++++++-----
|
||||
1 file changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
|
||||
index 833e982e..29686f4e 100644
|
||||
--- a/mesonbuild/interpreter.py
|
||||
+++ b/mesonbuild/interpreter.py
|
||||
@@ -92,12 +92,13 @@ class FeatureOptionHolder(InterpreterObject, ObjectHolder):
|
||||
def auto_method(self, args, kwargs):
|
||||
return self.held_object.is_auto()
|
||||
|
||||
-def extract_required_kwarg(kwargs):
|
||||
+def extract_required_kwarg(kwargs, subproject):
|
||||
val = kwargs.get('required', True)
|
||||
disabled = False
|
||||
required = False
|
||||
feature = None
|
||||
if isinstance(val, FeatureOptionHolder):
|
||||
+ FeatureNew('User option "feature"', '0.47.0').use(subproject)
|
||||
option = val.held_object
|
||||
feature = val.name
|
||||
if option.is_disabled():
|
||||
@@ -1412,7 +1413,7 @@ class CompilerHolder(InterpreterObject):
|
||||
if not isinstance(libname, str):
|
||||
raise InterpreterException('Library name not a string.')
|
||||
|
||||
- disabled, required, feature = extract_required_kwarg(kwargs)
|
||||
+ disabled, required, feature = extract_required_kwarg(kwargs, self.subproject)
|
||||
if disabled:
|
||||
mlog.log('Library', mlog.bold(libname), 'skipped: feature', mlog.bold(feature), 'disabled')
|
||||
lib = dependencies.ExternalLibrary(libname, None,
|
||||
@@ -2458,7 +2459,7 @@ external dependencies (including libraries) must go to "dependencies".''')
|
||||
@permittedKwargs(permitted_kwargs['add_languages'])
|
||||
@stringArgs
|
||||
def func_add_languages(self, node, args, kwargs):
|
||||
- disabled, required, feature = extract_required_kwarg(kwargs)
|
||||
+ disabled, required, feature = extract_required_kwarg(kwargs, self.subproject)
|
||||
if disabled:
|
||||
for lang in sorted(args, key=compilers.sort_clink):
|
||||
mlog.log('Compiler for language', mlog.bold(lang), 'skipped: feature', mlog.bold(feature), 'disabled')
|
||||
@@ -2719,7 +2720,7 @@ external dependencies (including libraries) must go to "dependencies".''')
|
||||
if not args:
|
||||
raise InterpreterException('No program name specified.')
|
||||
|
||||
- disabled, required, feature = extract_required_kwarg(kwargs)
|
||||
+ disabled, required, feature = extract_required_kwarg(kwargs, self.subproject)
|
||||
if disabled:
|
||||
mlog.log('Program', mlog.bold(' '.join(args)), 'skipped: feature', mlog.bold(feature), 'disabled')
|
||||
return ExternalProgramHolder(dependencies.NonExistingExternalProgram())
|
||||
@@ -2834,7 +2835,7 @@ external dependencies (including libraries) must go to "dependencies".''')
|
||||
name = args[0]
|
||||
display_name = name if name else '(anonymous)'
|
||||
|
||||
- disabled, required, feature = extract_required_kwarg(kwargs)
|
||||
+ disabled, required, feature = extract_required_kwarg(kwargs, self.subproject)
|
||||
if disabled:
|
||||
mlog.log('Dependency', mlog.bold(display_name), 'skipped: feature', mlog.bold(feature), 'disabled')
|
||||
return DependencyHolder(NotFoundDependency(self.environment), self.subproject)
|
||||
--
|
||||
2.18.0
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From 57382aad45504627649e6412fea62249e65b533e Mon Sep 17 00:00:00 2001
|
||||
From: Xavier Claessens <xavier.claessens@collabora.com>
|
||||
Date: Wed, 25 Jul 2018 09:54:48 -0400
|
||||
Subject: [PATCH 5/5] UserFeatureOption: Default to 'auto' when no value
|
||||
specified
|
||||
|
||||
Closes #3938.
|
||||
|
||||
(cherry picked from commit 5f9fda4accc0b1cf6952877533c04995d701e499)
|
||||
---
|
||||
mesonbuild/optinterpreter.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mesonbuild/optinterpreter.py b/mesonbuild/optinterpreter.py
|
||||
index 94efbcf9..8967a53b 100644
|
||||
--- a/mesonbuild/optinterpreter.py
|
||||
+++ b/mesonbuild/optinterpreter.py
|
||||
@@ -121,7 +121,7 @@ def string_array_parser(name, description, kwargs):
|
||||
def FeatureParser(name, description, kwargs):
|
||||
return coredata.UserFeatureOption(name,
|
||||
description,
|
||||
- kwargs.get('value', 'enabled'),
|
||||
+ kwargs.get('value', 'auto'),
|
||||
yielding=kwargs.get('yield', coredata.default_yielding))
|
||||
|
||||
option_types = {'string': StringParser,
|
||||
--
|
||||
2.18.0
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
%bcond_with check
|
||||
|
||||
Name: meson
|
||||
Version: 0.47.1
|
||||
Release: 5%{?dist}
|
||||
Version: 0.47.2
|
||||
Release: 1%{?dist}
|
||||
Summary: High productivity build system
|
||||
|
||||
License: ASL 2.0
|
||||
@ -14,8 +14,6 @@ Source0: https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%
|
||||
Patch0001: 0001-rpm-use-set_build_flags-skip-ci.patch
|
||||
Patch0002: 0002-rpm-use-shrink-skip-ci.patch
|
||||
Patch0003: 0003-rpm-pass-auto-features-enabled-skip-ci.patch
|
||||
Patch0004: 0004-Add-a-feature-new-entry-for-UserFeatureOption.patch
|
||||
Patch0005: 0005-UserFeatureOption-Default-to-auto-when-no-value-spec.patch
|
||||
|
||||
BuildArch: noarch
|
||||
Obsoletes: %{name}-gui < 0.31.0-3
|
||||
@ -122,6 +120,9 @@ export MESON_PRINT_TEST_OUTPUT=1
|
||||
%{_datadir}/polkit-1/actions/com.mesonbuild.install.policy
|
||||
|
||||
%changelog
|
||||
* Sat Aug 25 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.47.2-1
|
||||
- Update to 0.47.2
|
||||
|
||||
* Wed Jul 25 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.47.1-5
|
||||
- Backport more patches for "feature" option type
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (meson-0.47.1.tar.gz) = 6c8ffa81df702212d122e9e131d9d1f66602fa9c442c3fe95fa763860320869d1970279f6fa3e3dfc6456a065185931f1f206aa98256c7899b250cf5cc2b7eb8
|
||||
SHA512 (meson-0.47.2.tar.gz) = 3fe350c785406fad74232e477f8972b7ab74871bcb7d93e6f08640305aeb15172065c6a63300c2fe2c96ce877f08e95a15f829bf65a9ca0293a2f70ad2c799ef
|
||||
|
||||
Loading…
Reference in New Issue
Block a user