diff mbox series

[v10,13/26] meson: remove empty else and duplicated gio deps

Message ID 20200915171234.236-14-luoyonggang@gmail.com
State Superseded
Headers show
Series W32, W64 msys2/mingw patches | expand

Commit Message

罗勇刚(Yonggang Luo) Sept. 15, 2020, 5:12 p.m. UTC 
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
---
 meson.build | 6 ------
 1 file changed, 6 deletions(-)

Comments

Laurent Vivier Sept. 16, 2020, 9:10 a.m. UTC | #1 
Le 15/09/2020 à 19:12, Yonggang Luo a écrit :
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>

> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>

> ---

>  meson.build | 6 ------

>  1 file changed, 6 deletions(-)

> 

> diff --git a/meson.build b/meson.build

> index 690723b470..23cb1b8742 100644

> --- a/meson.build

> +++ b/meson.build

> @@ -317,7 +317,6 @@ opengl = not_found

>  if 'CONFIG_OPENGL' in config_host

>    opengl = declare_dependency(compile_args: config_host['OPENGL_CFLAGS'].split(),

>                                link_args: config_host['OPENGL_LIBS'].split())

> -else

>  endif

>  gtk = not_found

>  if 'CONFIG_GTK' in config_host

> @@ -344,11 +343,6 @@ if 'CONFIG_ICONV' in config_host

>    iconv = declare_dependency(compile_args: config_host['ICONV_CFLAGS'].split(),

>                               link_args: config_host['ICONV_LIBS'].split())

>  endif

> -gio = not_found

> -if 'CONFIG_GIO' in config_host

> -  gio = declare_dependency(compile_args: config_host['GIO_CFLAGS'].split(),

> -                           link_args: config_host['GIO_LIBS'].split())

> -endif

>  vnc = not_found

>  png = not_found

>  jpeg = not_found

> 


Applied to my trivial-patches branch.

Thanks,
Laurent
diff mbox series

Patch

diff --git a/meson.build b/meson.build
index 690723b470..23cb1b8742 100644
--- a/meson.build
+++ b/meson.build
@@ -317,7 +317,6 @@  opengl = not_found
 if 'CONFIG_OPENGL' in config_host
   opengl = declare_dependency(compile_args: config_host['OPENGL_CFLAGS'].split(),
                               link_args: config_host['OPENGL_LIBS'].split())
-else
 endif
 gtk = not_found
 if 'CONFIG_GTK' in config_host
@@ -344,11 +343,6 @@  if 'CONFIG_ICONV' in config_host
   iconv = declare_dependency(compile_args: config_host['ICONV_CFLAGS'].split(),
                              link_args: config_host['ICONV_LIBS'].split())
 endif
-gio = not_found
-if 'CONFIG_GIO' in config_host
-  gio = declare_dependency(compile_args: config_host['GIO_CFLAGS'].split(),
-                           link_args: config_host['GIO_LIBS'].split())
-endif
 vnc = not_found
 png = not_found
 jpeg = not_found