Merge 63d47a3 into 9c1b6a9

Author: bonzini

docs/markdown/snippets/dep_objects.md

@@ -0,0 +1,5 @@
+## New `declare_dependency(objects: )` argument
+
+A new argument to `declare_dependency` makes it possible to add objects
+directly to executables that use an internal dependency, without going
+for example through `link_whole`.

docs/markdown/snippets/gen_objects.md

@@ -0,0 +1,6 @@
+## Generated objects can be passed in the `objects:` keyword argument
+
+In previous versions of Meson, generated objects could only be
+passed as sources of a build target.  This was confusing, therefore
+generated objects can now be passed in the `objects:` keyword
+argument as well.

docs/yaml/functions/_build_target_base.yaml

@@ -191,11 +191,14 @@ kwargs:
       (but *not* before that). On Windows, this argument has no effect.
 
   objects:
-    type: list[extracted_obj]
+    type: list[extracted_obj | file | str]
     description: |
-      List of prebuilt object files (usually for third party
-      products you don't have source to) that should be linked in this
-      target, **never** use this for object files that you build yourself.
+      List of object files that should be linked in this target.
+
+      **Since 1.1.0** this can include generated files in addition to
+      object files that you don't have source to or that object files
+      produced by other build targets.  In earlier release, generated
+      object files had to be placed in `sources`.
 
   name_prefix:
     type: str | list[void]

docs/yaml/functions/declare_dependency.yaml

@@ -71,3 +71,10 @@ kwargs:
     description: |
       the directories to add to the string search path (i.e. `-J` switch for DMD).
       Must be [[@inc]] objects or plain strings.
+
+  objects:
+    type: list[extracted_obj]
+    since: 1.1.0
+    description: |
+      a list of object files, to be linked directly into the targets that use the
+      dependency.

docs/yaml/objects/build_tgt.yaml

@@ -13,8 +13,8 @@ methods:
     source files. This is typically used to take single object files and link
     them to unit tests or to compile some source files with custom flags. To
     use the object file(s) in another build target, use the
-    `objects:` keyword argument to a [[build_target]] or include them in the command
-    line of a [[custom_target]].
+    `objects:` keyword argument to a [[build_target]] or [[declare_dependency]],
+    or include them in the command line of a [[custom_target]].
   varargs:
     name: source
     type: str | file

mesonbuild/build.py

@@ -774,12 +774,11 @@ def process_objectlist(self, objects):
         for s in objects:
             if isinstance(s, (str, File, ExtractedObjects)):
                 self.objects.append(s)
-            elif isinstance(s, (GeneratedList, CustomTarget)):
-                msg = 'Generated files are not allowed in the \'objects\' kwarg ' + \
-                    f'for target {self.name!r}.\nIt is meant only for ' + \
-                    'pre-built object files that are shipped with the\nsource ' + \
-                    'tree. Try adding it in the list of sources.'
-                raise InvalidArguments(msg)
+            elif isinstance(s, (CustomTarget, CustomTargetIndex, GeneratedList)):
+                non_objects = [o for o in s.get_outputs() if not is_object(o)]
+                if non_objects:
+                    raise InvalidArguments(f'Generated file {non_objects[0]} in the \'objects\' kwarg is not an object.')
+                self.generated.append(s)
             else:
                 raise InvalidArguments(f'Bad object of type {type(s).__name__!r} in target {self.name!r}.')
 
@@ -1292,6 +1291,7 @@ def add_deps(self, deps):
                 # Those parts that are internal.
                 self.process_sourcelist(dep.sources)
                 self.add_include_dirs(dep.include_directories, dep.get_include_type())
+                self.objects.extend(dep.objects)
                 for l in dep.libraries:
                     self.link(l)
                 for l in dep.whole_libraries:

mesonbuild/dependencies/base.py

@@ -31,13 +31,12 @@
 
 if T.TYPE_CHECKING:
     from .._typing import ImmutableListProtocol
-    from ..build import StructuredSources
     from ..compilers.compilers import Compiler
     from ..environment import Environment
     from ..interpreterbase import FeatureCheckBase
     from ..build import (
         CustomTarget, IncludeDirs, CustomTargetIndex, LibTypes,
-        StaticLibrary
+        StaticLibrary, StructuredSources, ExtractedObjects
     )
     from ..mesonlib import FileOrString
 
@@ -252,7 +251,8 @@ def __init__(self, version: str, incdirs: T.List['IncludeDirs'], compile_args: T
                  whole_libraries: T.List[T.Union[StaticLibrary, CustomTarget, CustomTargetIndex]],
                  sources: T.Sequence[T.Union[FileOrString, CustomTarget, StructuredSources]],
                  ext_deps: T.List[Dependency], variables: T.Dict[str, str],
-                 d_module_versions: T.List[T.Union[str, int]], d_import_dirs: T.List['IncludeDirs']):
+                 d_module_versions: T.List[T.Union[str, int]], d_import_dirs: T.List['IncludeDirs'],
+                 objects: T.List['ExtractedObjects']):
         super().__init__(DependencyTypeName('internal'), {})
         self.version = version
         self.is_found = True
@@ -264,6 +264,7 @@ def __init__(self, version: str, incdirs: T.List['IncludeDirs'], compile_args: T
         self.sources = list(sources)
         self.ext_deps = ext_deps
         self.variables = variables
+        self.objects = objects
         if d_module_versions:
             self.d_features['versions'] = d_module_versions
         if d_import_dirs:

mesonbuild/interpreter/interpreter.py

@@ -670,12 +670,14 @@ def func_files(self, node: mparser.FunctionNode, args: T.Tuple[T.List[str]], kwa
         SOURCES_KW,
         VARIABLES_KW.evolve(since='0.54.0', since_values={list: '0.56.0'}),
         KwargInfo('version', (str, NoneType)),
+        KwargInfo('objects', ContainerTypeInfo(list, build.ExtractedObjects), listify=True, default=[], since='1.1.0'),
     )
     def func_declare_dependency(self, node, args, kwargs):
         deps = kwargs['dependencies']
         incs = self.extract_incdirs(kwargs)
         libs = kwargs['link_with']
         libs_whole = kwargs['link_whole']
+        objects = kwargs['objects']
         sources = self.source_strings_to_files(kwargs['sources'])
         compile_args = kwargs['compile_args']
         link_args = kwargs['link_args']
@@ -703,7 +705,8 @@ def func_declare_dependency(self, node, args, kwargs):
 
         dep = dependencies.InternalDependency(version, incs, compile_args,
                                               link_args, libs, libs_whole, sources, deps,
-                                              variables, d_module_versions, d_import_dirs)
+                                              variables, d_module_versions, d_import_dirs,
+                                              objects)
         return dep
 
     @typed_pos_args('assert', bool, optargs=[str])

mesonbuild/modules/pkgconfig.py

@@ -193,6 +193,8 @@ def _process_libs(
                     self.add_version_reqs(obj.name, obj.version_reqs)
             elif isinstance(obj, dependencies.InternalDependency):
                 if obj.found():
+                    if obj.objects:
+                        raise mesonlib.MesonException('.pc file cannot refer to individual object files.')
                     processed_libs += obj.get_link_args()
                     processed_cflags += obj.get_compile_args()
                     self._add_lib_dependencies(obj.libraries, obj.whole_libraries, obj.ext_deps, public, private_external_deps=True)

test cases/common/260 declare_dependency objects/bar.c

@@ -0,0 +1 @@
+void bar() {}