qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
	"Daniel P . Berrangé" <berrange@redhat.com>,
	qemu-trivial@nongnu.org, "Michael Tokarev" <mjt@tls.msk.ru>,
	"Laurent Vivier" <laurent@vivier.eu>,
	"Yonggang Luo" <luoyonggang@gmail.com>
Subject: [PULL 05/17] meson: remove empty else and duplicated gio deps
Date: Sat, 19 Sep 2020 20:44:39 +0200	[thread overview]
Message-ID: <20200919184451.2129349-6-laurent@vivier.eu> (raw)
In-Reply-To: <20200919184451.2129349-1-laurent@vivier.eu>

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



  parent reply	other threads:[~2020-09-19 18:48 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-19 18:44 [PULL 00/17] Trivial branch for 5.2 patches Laurent Vivier
2020-09-19 18:44 ` [PULL 01/17] hw/gpio/max7310: Remove impossible check Laurent Vivier
2020-09-19 18:44 ` [PULL 02/17] hw/ppc/ppc4xx_pci: Replace magic value by the PCI_NUM_PINS definition Laurent Vivier
2020-09-19 18:44 ` [PULL 03/17] ui/spice-input: Remove superfluous forward declaration Laurent Vivier
2020-09-19 18:44 ` [PULL 04/17] manual: escape backslashes in "parsed-literal" blocks Laurent Vivier
2020-09-19 18:44 ` Laurent Vivier [this message]
2020-09-19 18:44 ` [PULL 06/17] hw/timer/hpet: Remove unused functions hpet_ram_readb, hpet_ram_readw Laurent Vivier
2020-09-19 18:44 ` [PULL 07/17] hw/timer/hpet: Fix debug format strings Laurent Vivier
2020-09-19 18:44 ` [PULL 08/17] scripts/git.orderfile: Display meson files along with buildsys ones Laurent Vivier
2020-09-19 18:44 ` [PULL 09/17] qemu/: fix some comment spelling errors Laurent Vivier
2020-09-19 18:44 ` [PULL 10/17] migration/: " Laurent Vivier
2020-09-19 18:44 ` [PULL 11/17] docs/: " Laurent Vivier
2020-09-19 18:44 ` [PULL 12/17] scripts/: " Laurent Vivier
2020-09-19 18:44 ` [PULL 13/17] util/: " Laurent Vivier
2020-09-19 18:44 ` [PULL 14/17] linux-user/: " Laurent Vivier
2020-09-19 18:44 ` [PULL 15/17] disas/: " Laurent Vivier
2020-09-19 18:44 ` [PULL 16/17] qapi/: " Laurent Vivier
2020-09-19 18:44 ` [PULL 17/17] contrib/: " Laurent Vivier
2020-09-19 19:10 ` [PULL 00/17] Trivial branch for 5.2 patches no-reply
2020-09-22 15:40 ` Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200919184451.2129349-6-laurent@vivier.eu \
    --to=laurent@vivier.eu \
    --cc=berrange@redhat.com \
    --cc=luoyonggang@gmail.com \
    --cc=mjt@tls.msk.ru \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-trivial@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).