system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-08 20:15:55 +00:00
Code Issues Projects Releases Wiki Activity

meson: restore specifications of dependency on version_h

Browse Source 
This partially reverts 3c1eee5bed.
I thought that it is not necessary, but
https://mesonbuild.com/Reference-manual_functions.html#vcs_tag says:

> This method returns a custom_tgt should be used to signal dependencies if
> other targets use the file outputted by this.
>
> For example, if you generate a header with this and want to use that in a
> build target, you must add the return value to the sources of that build
> target. Without that, Meson will not know the order in which to build the
> targets.

We can use version_h directly, since we already have it.

Hopefully fixes https://github.com/systemd/systemd/issues/28994.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2023-08-28 14:46:24 +03:00 committed by Luca Boccassi
parent 1686c884bf
commit 56a0b9065e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -1854,6 +1854,7 @@ jinja2_cmdline = [meson_render_jinja2, config_h, version_h]
userspace = declare_dependency(
compile_args : userspace_c_args,
link_args : userspace_c_ld_args,
sources : version_h,
)
man_page_depends = []

7
src/boot/efi/meson.build
View File

@ -304,6 +304,7 @@ foreach archspec : efi_archspecs
'efi' + archspec['arch'],
fundamental_sources,
libefi_sources,
version_h,
include_directories : efi_includes,
c_args : archspec['c_args'],
gnu_symbol_visibility : 'hidden',
@ -323,19 +324,19 @@ foreach archspec : efi_archspecs
efi_elf_binaries += executable(
'systemd-boot' + archspec['arch'],
sources : systemd_boot_sources,
sources : [systemd_boot_sources, version_h],
name_suffix : 'elf',
kwargs : kwargs)
efi_elf_binaries += executable(
'linux' + archspec['arch'],
sources : stub_sources,
sources : [stub_sources, version_h],
name_suffix : 'elf.stub',
kwargs : kwargs)
efi_elf_binaries += executable(
'addon' + archspec['arch'],
sources : addon_sources,
sources : [addon_sources, version_h],
name_suffix : 'elf.stub',
kwargs : kwargs)
endforeach