fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2025-12-20 06:50:05 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

meson: make libinput-git-version.h a source of libinput-record

Browse source 
Fixes the dependency chain, otherwise a race condition between building
libinput-record and building the git version header causes random build
failures.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2018-03-07 08:48:01 +10:00
parent cd63ba2cc0
commit f734e973be
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
meson.build
View file

@ -240,10 +240,10 @@ pkgconfig.generate(
libraries : lib_libinput libraries : lib_libinput
) )
vcs_tag(['git', 'describe'], git_version_h = vcs_tag(['git', 'describe'],
'unknown', 'unknown',
input : 'src/libinput-git-version.h.in', input : 'src/libinput-git-version.h.in',
output :'libinput-git-version.h') output :'libinput-git-version.h')
# Restore the SELinux context for the libinput.so.a.b.c on install # Restore the SELinux context for the libinput.so.a.b.c on install
# meson bug https://github.com/mesonbuild/meson/issues/1967 # meson bug https://github.com/mesonbuild/meson/issues/1967
@ -469,7 +469,7 @@ configure_file(input : 'tools/libinput-measure-trackpoint-range.man',
install_dir : join_paths(get_option('mandir'), 'man1') install_dir : join_paths(get_option('mandir'), 'man1')
) )
libinput_record_sources = [ 'tools/libinput-record.c' ] libinput_record_sources = [ 'tools/libinput-record.c', git_version_h ]
executable('libinput-record', executable('libinput-record',
libinput_record_sources, libinput_record_sources,
dependencies : deps_tools, dependencies : deps_tools,