Merge pull request #28977 from keszybz/drop-versiondep

meson: simplify handling of the version tag

meson.build

@@ -1811,32 +1811,24 @@ version_tag = get_option('version-tag')
 # Check that we have either .git/ (a normal clone) or a .git file (a work-tree) and that we don't
 # get confused if a tarball is extracted in a higher-level git repository.
 if version_tag == '' and git.found() and fs.exists(project_source_root / '.git')
-        version_h = vcs_tag(
-                input : 'src/version/version.h.in',
-                output : 'version.h',
-                # If the working tree has no tags (CI builds), the first git-describe will fail
-                # and we fall back to project_version-commitid instead.
-                # TODO: Use 'sh' variable with meson >= 0.63.0
-                command: ['sh',
-                          '-euc',
-                          '''git -C "$1" describe --abbrev=7 --dirty=^ 2>/dev/null ||
-                                echo "$2-$(git -C "$1" describe --always --abbrev=7)" |
-                                sed 's/^v//; s/-rc/~rc/' ''',
-                          '_',
-                          project_source_root,
-                          meson.project_version()])
+        # If the working tree has no tags (CI builds), the first git-describe will fail
+        # and we fall back to project_version-commitid instead.
+        version_cmd = '''git -C "$1" describe --abbrev=7 --dirty=^ 2>/dev/null ||
+                         echo "$2-$(git -C "$1" describe --always --abbrev=7)" |
+                         sed 's/^v//; s/-rc/~rc/' '''
 else
-        vcs_data = configuration_data()
-        vcs_data.set('VCS_TAG', version_tag == '' ? meson.project_version() : version_tag)
-        version_h = configure_file(configuration : vcs_data,
-                                   input : 'src/version/version.h.in',
-                                   output : 'version.h')
+        version_cmd = '''echo "$2" '''
 endif
 
-versiondep = declare_dependency(
-        sources : version_h,
-        include_directories : include_directories('.'),
-)
+version_h = vcs_tag(
+        input : 'src/version/version.h.in',
+        output : 'version.h',
+        # TODO: Use 'sh' variable with meson >= 0.63.0
+        command: ['sh', '-euc', version_cmd,
+                  '_',
+                  project_source_root,
+                  version_tag == '' ? meson.project_version() : version_tag,
+                 ])
 
 shared_lib_tag = get_option('shared-lib-tag')
 if shared_lib_tag == ''
@@ -1862,7 +1854,6 @@ jinja2_cmdline = [meson_render_jinja2, config_h, version_h]
 userspace = declare_dependency(
         compile_args : userspace_c_args,
         link_args : userspace_c_ld_args,
-        dependencies : versiondep,
 )
 
 man_page_depends = []
@@ -1888,6 +1879,8 @@ dbus_programs = []
 # A list of boot stubs. Required for testing of ukify.
 boot_stubs = []
 
+build_dir_include = include_directories('.')
+
 basic_includes = include_directories(
         'src/basic',
         'src/fundamental',

src/boot/efi/meson.build

@@ -118,7 +118,11 @@ configure_file(
 
 ############################################################
 
-efi_includes = [fundamental_include, include_directories('.')]
+efi_includes = [
+        build_dir_include,
+        fundamental_include,
+        include_directories('.'),
+]
 
 efi_c_args = [
         '-DSD_BOOT=1',
@@ -302,7 +306,6 @@ foreach archspec : efi_archspecs
                 libefi_sources,
                 include_directories : efi_includes,
                 c_args : archspec['c_args'],
-                dependencies : versiondep,
                 gnu_symbol_visibility : 'hidden',
                 override_options : efi_override_options,
                 pic : true)
@@ -313,7 +316,6 @@ foreach archspec : efi_archspecs
                 'link_args' : archspec['link_args'],
                 'link_with' : libefi,
                 'link_depends' : elf2efi_lds,
-                'dependencies' : versiondep,
                 'gnu_symbol_visibility' : 'hidden',
                 'override_options' : efi_override_options,
                 'pie' : true,