mirror of
https://github.com/systemd/systemd
synced 2024-07-21 18:24:38 +00:00
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.
This commit is contained in:
parent
1671799bee
commit
3c1eee5bed
|
@ -1830,11 +1830,6 @@ version_h = vcs_tag(
|
||||||
version_tag == '' ? meson.project_version() : version_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')
|
shared_lib_tag = get_option('shared-lib-tag')
|
||||||
if shared_lib_tag == ''
|
if shared_lib_tag == ''
|
||||||
shared_lib_tag = meson.project_version()
|
shared_lib_tag = meson.project_version()
|
||||||
|
@ -1859,7 +1854,6 @@ jinja2_cmdline = [meson_render_jinja2, config_h, version_h]
|
||||||
userspace = declare_dependency(
|
userspace = declare_dependency(
|
||||||
compile_args : userspace_c_args,
|
compile_args : userspace_c_args,
|
||||||
link_args : userspace_c_ld_args,
|
link_args : userspace_c_ld_args,
|
||||||
dependencies : versiondep,
|
|
||||||
)
|
)
|
||||||
|
|
||||||
man_page_depends = []
|
man_page_depends = []
|
||||||
|
@ -1885,6 +1879,8 @@ dbus_programs = []
|
||||||
# A list of boot stubs. Required for testing of ukify.
|
# A list of boot stubs. Required for testing of ukify.
|
||||||
boot_stubs = []
|
boot_stubs = []
|
||||||
|
|
||||||
|
build_dir_include = include_directories('.')
|
||||||
|
|
||||||
basic_includes = include_directories(
|
basic_includes = include_directories(
|
||||||
'src/basic',
|
'src/basic',
|
||||||
'src/fundamental',
|
'src/fundamental',
|
||||||
|
|
|
@ -118,7 +118,11 @@ configure_file(
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
|
|
||||||
efi_includes = [fundamental_include, include_directories('.')]
|
efi_includes = [
|
||||||
|
build_dir_include,
|
||||||
|
fundamental_include,
|
||||||
|
include_directories('.'),
|
||||||
|
]
|
||||||
|
|
||||||
efi_c_args = [
|
efi_c_args = [
|
||||||
'-DSD_BOOT=1',
|
'-DSD_BOOT=1',
|
||||||
|
@ -302,7 +306,6 @@ foreach archspec : efi_archspecs
|
||||||
libefi_sources,
|
libefi_sources,
|
||||||
include_directories : efi_includes,
|
include_directories : efi_includes,
|
||||||
c_args : archspec['c_args'],
|
c_args : archspec['c_args'],
|
||||||
dependencies : versiondep,
|
|
||||||
gnu_symbol_visibility : 'hidden',
|
gnu_symbol_visibility : 'hidden',
|
||||||
override_options : efi_override_options,
|
override_options : efi_override_options,
|
||||||
pic : true)
|
pic : true)
|
||||||
|
@ -313,7 +316,6 @@ foreach archspec : efi_archspecs
|
||||||
'link_args' : archspec['link_args'],
|
'link_args' : archspec['link_args'],
|
||||||
'link_with' : libefi,
|
'link_with' : libefi,
|
||||||
'link_depends' : elf2efi_lds,
|
'link_depends' : elf2efi_lds,
|
||||||
'dependencies' : versiondep,
|
|
||||||
'gnu_symbol_visibility' : 'hidden',
|
'gnu_symbol_visibility' : 'hidden',
|
||||||
'override_options' : efi_override_options,
|
'override_options' : efi_override_options,
|
||||||
'pie' : true,
|
'pie' : true,
|
||||||
|
|
Loading…
Reference in a new issue