[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/17] meson: remove empty else and duplicated gio deps
From: |
Laurent Vivier |
Subject: |
[PULL 05/17] meson: remove empty else and duplicated gio deps |
Date: |
Sat, 19 Sep 2020 20:44:39 +0200 |
From: Yonggang Luo <luoyonggang@gmail.com>
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20200915171234.236-14-luoyonggang@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
meson.build | 6 ------
1 file changed, 6 deletions(-)
diff --git a/meson.build b/meson.build
index bba766b4bc66..f4d1ab109680 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
--
2.26.2
- [PULL 00/17] Trivial branch for 5.2 patches, Laurent Vivier, 2020/09/19
- [PULL 03/17] ui/spice-input: Remove superfluous forward declaration, Laurent Vivier, 2020/09/19
- [PULL 02/17] hw/ppc/ppc4xx_pci: Replace magic value by the PCI_NUM_PINS definition, Laurent Vivier, 2020/09/19
- [PULL 01/17] hw/gpio/max7310: Remove impossible check, Laurent Vivier, 2020/09/19
- [PULL 04/17] manual: escape backslashes in "parsed-literal" blocks, Laurent Vivier, 2020/09/19
- [PULL 05/17] meson: remove empty else and duplicated gio deps,
Laurent Vivier <=
- [PULL 06/17] hw/timer/hpet: Remove unused functions hpet_ram_readb, hpet_ram_readw, Laurent Vivier, 2020/09/19
- [PULL 08/17] scripts/git.orderfile: Display meson files along with buildsys ones, Laurent Vivier, 2020/09/19
- [PULL 07/17] hw/timer/hpet: Fix debug format strings, Laurent Vivier, 2020/09/19
- [PULL 09/17] qemu/: fix some comment spelling errors, Laurent Vivier, 2020/09/19
- [PULL 13/17] util/: fix some comment spelling errors, Laurent Vivier, 2020/09/19
- [PULL 16/17] qapi/: fix some comment spelling errors, Laurent Vivier, 2020/09/19
- [PULL 12/17] scripts/: fix some comment spelling errors, Laurent Vivier, 2020/09/19
- [PULL 15/17] disas/: fix some comment spelling errors, Laurent Vivier, 2020/09/19
- [PULL 14/17] linux-user/: fix some comment spelling errors, Laurent Vivier, 2020/09/19
- [PULL 17/17] contrib/: fix some comment spelling errors, Laurent Vivier, 2020/09/19