mirror of
https://github.com/systemd/systemd.git
synced 2024-11-23 10:13:34 +08:00
meson: make version a dependency and use it in libbasic
This should hopefully ensure it gets generated before basic build happens. Fixes #11483.
This commit is contained in:
parent
04ba6ed167
commit
d1084aa2f8
@ -580,6 +580,13 @@ vcs_tagger = [meson.source_root() + '/tools/meson-vcs-tag.sh',
|
||||
get_option('version-tag'),
|
||||
meson.project_version()]
|
||||
|
||||
version_h = vcs_tag(
|
||||
input : 'src/version/version.h.in',
|
||||
output : 'version.h',
|
||||
command: vcs_tagger)
|
||||
|
||||
versiondep = declare_dependency(sources: version_h)
|
||||
|
||||
sed = find_program('sed')
|
||||
awk = find_program('awk')
|
||||
m4 = find_program('m4')
|
||||
|
@ -1,10 +1,5 @@
|
||||
# SPDX-License-Identifier: LGPL-2.1+
|
||||
|
||||
version_h = vcs_tag(
|
||||
command: vcs_tagger,
|
||||
input : 'version.h.in',
|
||||
output : 'version.h')
|
||||
|
||||
basic_sources = files('''
|
||||
MurmurHash2.c
|
||||
MurmurHash2.h
|
||||
@ -216,8 +211,6 @@ basic_sources = files('''
|
||||
xattr-util.h
|
||||
'''.split())
|
||||
|
||||
basic_sources += version_h
|
||||
|
||||
missing_audit_h = files('missing_audit.h')
|
||||
missing_capability_h = files('missing_capability.h')
|
||||
missing_network_h = files('missing_network.h')
|
||||
@ -299,7 +292,8 @@ libbasic = static_library(
|
||||
'basic',
|
||||
basic_sources,
|
||||
include_directories : includes,
|
||||
dependencies : [threads,
|
||||
dependencies : [versiondep,
|
||||
threads,
|
||||
libcap,
|
||||
libselinux,
|
||||
libm],
|
||||
|
Loading…
Reference in New Issue
Block a user