[Spice-devel] [PATCH spice-gtk 1/3] meson: use 0.49 support for pie
Frediano Ziglio
fziglio at redhat.com
Sat Dec 22 15:06:45 UTC 2018
>
> From: Marc-André Lureau <marcandre.lureau at redhat.com>
>
> Fixes
> WARNING: Use the 'pie' kwarg instead of passing '-fpie' manually to
> 'spice-client-glib-usb-acl-helper'
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau at redhat.com>
Patch looks good.
Technically you can't fix a warning, you remove it.
You can "fix" a warning only if this is a real error, but in
this case you need an explanation on why this is an error and
not a warning.
> ---
> meson.build | 2 +-
> src/meson.build | 13 +++----------
> 2 files changed, 4 insertions(+), 11 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index 4e4bee8..67149e7 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -4,7 +4,7 @@
> project('spice-gtk', 'c',
> version : run_command('build-aux/git-version-gen',
> '${MESON_SOURCE_ROOT}/.tarball-version', check :
> true).stdout().strip(),
> license : 'LGPLv2.1',
> - meson_version : '>= 0.47.2')
> + meson_version : '>= 0.49')
>
> message('Updating submodules')
> run_command('build-aux/meson/check-spice-common', check : true)
> diff --git a/src/meson.build b/src/meson.build
> index dcf4dcc..a8e1d05 100644
> --- a/src/meson.build
> +++ b/src/meson.build
> @@ -228,22 +228,15 @@ spice_client_glib_gir =
> gnome.generate_gir(spice_client_glib_lib,
> # spice-client-glib-usb-acl-helper
> #
> if spice_gtk_has_polkit
> - usb_acl_helper_c_args = []
> - usb_acl_helper_link_args = []
> -
> - if spice_gtk_has_pie
> - usb_acl_helper_c_args += compiler.get_supported_arguments(['-fPIE'])
> - usb_acl_helper_link_args +=
> compiler.get_supported_link_arguments(['-pie', '-Wl,-z,relro',
> '-Wl,-z,now'])
> - endif
> executable('spice-client-glib-usb-acl-helper',
> 'spice-client-glib-usb-acl-helper.c',
> include_directories : spice_gtk_include,
> install : true,
> install_dir : spice_gtk_usb_acl_helper_dir,
> install_mode : ['rwsr-xr-x', 'root', 'root'],
> - c_args : usb_acl_helper_c_args,
> - link_args : usb_acl_helper_link_args,
> - dependencies : spice_gtk_deps)
> + dependencies : spice_gtk_deps,
> + pie : spice_gtk_has_pie
> + )
> endif
>
Frediano
More information about the Spice-devel
mailing list