Re: [PATCH 4/6] configure / meson: Move check for sys/signal.h to meson.build

[Laurent Vivier <laurent@vivier.eu>]

Le 18/11/2020 à 18:10, Thomas Huth a écrit :
> This check can be done in a much shorter way in meson.build
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  configure   | 10 ----------
>  meson.build |  1 +
>  2 files changed, 1 insertion(+), 10 deletions(-)
> 
> diff --git a/configure b/configure
> index b3e1052a58..871e4bb9fb 100755
> --- a/configure
> +++ b/configure
> @@ -3088,13 +3088,6 @@ EOF
>      fi
>  fi
>  
> -#########################################
> -# sys/signal.h check
> -have_sys_signal_h=no
> -if check_include "sys/signal.h" ; then
> -  have_sys_signal_h=yes
> -fi
> -
>  ##########################################
>  # VTE probe
>  
> @@ -6184,9 +6177,6 @@ fi
>  if test "$have_openpty" = "yes" ; then
>      echo "HAVE_OPENPTY=y" >> $config_host_mak
>  fi
> -if test "$have_sys_signal_h" = "yes" ; then
> -    echo "HAVE_SYS_SIGNAL_H=y" >> $config_host_mak
> -fi
>  
>  # Work around a system header bug with some kernel/XFS header
>  # versions where they both try to define 'struct fsxattr':
> diff --git a/meson.build b/meson.build
> index d6b633f17f..054e40e9a5 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -811,6 +811,7 @@ config_host_data.set('QEMU_VERSION_MICRO', meson.project_version().split('.')[2]
>  config_host_data.set('HAVE_DRM_H', cc.has_header('libdrm/drm.h'))
>  config_host_data.set('HAVE_PTY_H', cc.has_header('pty.h'))
>  config_host_data.set('HAVE_SYS_IOCCOM_H', cc.has_header('sys/ioccom.h'))
> +config_host_data.set('HAVE_SYS_SIGNAL_H', cc.has_header('sys/signal.h'))
>  
>  ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target
>  arrays = ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST']
> 

Applied to my trivial-patches branch.

Thanks,
Laurent