interpreter: allow passing default default_options to do_subproject

Apply the default_library=... default after the default options have been
converted to a dictionary, to avoid having to deal with all the possible types
of the default_options keyword argument.

Fixes: #14532
Signed-off-by: Paolo Bonzini <[email protected]>
(cherry picked from commit 42d531d)

Author: bonzini

mesonbuild/interpreter/dependencyfallbacks.py

@@ -4,14 +4,12 @@
 
 from __future__ import annotations
 
-import copy
-
 from .interpreterobjects import extract_required_kwarg
 from .. import mlog
 from .. import dependencies
 from .. import build
 from ..wrap import WrapMode
-from ..mesonlib import extract_as_list, stringlistify, version_compare_many, listify
+from ..mesonlib import extract_as_list, stringlistify, version_compare_many
 from ..options import OptionKey
 from ..dependencies import Dependency, DependencyException, NotFoundDependency
 from ..interpreterbase import (MesonInterpreterObject, FeatureNew,
@@ -124,21 +122,17 @@ def _do_subproject(self, kwargs: TYPE_nkwargs, func_args: TYPE_nvar, func_kwargs
         # dependency('foo', static: true) should implicitly add
         # default_options: ['default_library=static']
         static = kwargs.get('static')
-        default_options = func_kwargs.get('default_options', {})
-        if static is not None and 'default_library' not in default_options:
+        extra_default_options = {}
+        if static is not None:
             default_library = 'static' if static else 'shared'
             mlog.log(f'Building fallback subproject with default_library={default_library}')
-            default_options = copy.copy(default_options)
-            default_options['default_library'] = default_library
-            func_kwargs['default_options'] = default_options
+            extra_default_options['default_library'] = default_library
 
         # Configure the subproject
         subp_name = self.subproject_name
         varname = self.subproject_varname
         func_kwargs.setdefault('version', [])
-        if 'default_options' in kwargs and isinstance(kwargs['default_options'], str):
-            func_kwargs['default_options'] = listify(kwargs['default_options'])
-        self.interpreter.do_subproject(subp_name, func_kwargs)
+        self.interpreter.do_subproject(subp_name, func_kwargs, extra_default_options=extra_default_options)
         return self._get_subproject_dep(subp_name, varname, kwargs)
 
     def _get_subproject(self, subp_name: str) -> T.Optional[SubprojectHolder]:

mesonbuild/interpreter/interpreter.py

@@ -867,7 +867,8 @@ def disabled_subproject(self, subp_name: str, disabled_feature: T.Optional[str]
         self.subprojects[subp_name] = sub
         return sub
 
-    def do_subproject(self, subp_name: str, kwargs: kwtypes.DoSubproject, force_method: T.Optional[wrap.Method] = None) -> SubprojectHolder:
+    def do_subproject(self, subp_name: str, kwargs: kwtypes.DoSubproject, force_method: T.Optional[wrap.Method] = None,
+                      extra_default_options: T.Optional[T.Dict[str, options.ElementaryOptionValues]] = None) -> SubprojectHolder:
         if subp_name == 'sub_static':
             pass
         disabled, required, feature = extract_required_kwarg(kwargs, self.subproject)
@@ -881,6 +882,8 @@ def do_subproject(self, subp_name: str, kwargs: kwtypes.DoSubproject, force_meth
             default_options = [default_options]
         if isinstance(default_options, list):
             default_options = dict((x.split('=', 1) for x in default_options))
+        if extra_default_options:
+            default_options = {**extra_default_options, **default_options}
 
         if subp_name == '':
             raise InterpreterException('Subproject name must not be empty.')