From 768c87697e57024b9f1552f26baa20b0840935de Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Thu, 12 May 2022 11:17:51 +0100 Subject: [PATCH] build: Specify all inputs to concat-files-helper.py Since Meson 0.52, a list of inputs is correctly supported, so our workaround can be removed. Signed-off-by: Philip Withnall --- docs/reference/gio/meson.build | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/docs/reference/gio/meson.build b/docs/reference/gio/meson.build index 20e24ba09..723d6a8dd 100644 --- a/docs/reference/gio/meson.build +++ b/docs/reference/gio/meson.build @@ -147,16 +147,11 @@ if get_option('gtk_doc') configuration: version_conf ) - # FIXME: configure_file() does not support more than one file in input - # argument. If input argument is omitted then meson checks that all items in - # the command array are strings. But if we have an input then extra files - # can be passed in command array. - # See https://github.com/mesonbuild/meson/issues/5893 concat_files_helper = find_program('concat-files-helper.py') configure_file( output : 'gio-sections.txt', - input : sections_files[0], - command : [concat_files_helper, '@OUTPUT@'] + sections_files, + input : sections_files, + command : [concat_files_helper, '@OUTPUT@', '@INPUT@'], ) configure_file(