From: Alex Xu (Hello71) Date: Tue, 28 Jan 2025 22:17:01 +0000 (-0500) Subject: meson: generate keyboard-keys-list from local input.h X-Git-Tag: v258-rc1~1455 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc996fd1ba7bce7be4cbae0d0d5ba7c35e8c3f50;p=thirdparty%2Fsystemd.git meson: generate keyboard-keys-list from local input.h otherwise it will use the system input.h which will fail to build if newer than the bundled version Fixes: 0a73c8e7b8 ("linux: import input.h and friends") --- diff --git a/src/udev/generate-keyboard-keys-list.sh b/src/udev/generate-keyboard-keys-list.sh index ead31133423..4cac5073220 100755 --- a/src/udev/generate-keyboard-keys-list.sh +++ b/src/udev/generate-keyboard-keys-list.sh @@ -3,7 +3,7 @@ set -eu set -o pipefail -${1:?} -dM -include linux/input.h - / { next } /^#define[ \t]+(KEY|BTN)_[^ ]+[ \t]+[0-9BK]/ { print $2 } ' diff --git a/src/udev/meson.build b/src/udev/meson.build index 697d1081419..b3f27e0df2e 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build @@ -62,8 +62,9 @@ endif generate_keyboard_keys_list = find_program('generate-keyboard-keys-list.sh') keyboard_keys_list_txt = custom_target( 'keyboard-keys-list.txt', + input : files('../basic/linux/input.h'), output : 'keyboard-keys-list.txt', - command : [generate_keyboard_keys_list, cpp], + command : [generate_keyboard_keys_list, cpp, '@INPUT@'], capture : true) generate_keyboard_keys_gperf = find_program('generate-keyboard-keys-gperf.sh')