From 3c1eee5beda642707037b189481c3c30d1668da7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Sat, 26 Aug 2023 11:36:02 +0200
Subject: [PATCH] meson: drop "versiondep" object

It was added to make sure that the version tag was built early
enough. Now that we use vcs_tag, meson should take care of building
it early enough.
---
 meson.build              | 8 ++------
 src/boot/efi/meson.build | 8 +++++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/meson.build b/meson.build
index a599c0ca8f..22dcf2d950 100644
--- a/meson.build
+++ b/meson.build
@@ -1830,11 +1830,6 @@ version_h = vcs_tag(
                   version_tag == '' ? meson.project_version() : version_tag,
                  ])
 
-versiondep = declare_dependency(
-        sources : version_h,
-        include_directories : include_directories('.'),
-)
-
 shared_lib_tag = get_option('shared-lib-tag')
 if shared_lib_tag == ''
         shared_lib_tag = meson.project_version()
@@ -1859,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 = []
@@ -1885,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',
diff --git a/src/boot/efi/meson.build b/src/boot/efi/meson.build
index 0effa90c15..eccec4d493 100644
--- a/src/boot/efi/meson.build
+++ b/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,