From patchwork Tue Sep 15 12:13:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?572X5YuH5YiaKFlvbmdnYW5nIEx1byk=?= X-Patchwork-Id: 305382 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.3 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_INVALID, DKIM_SIGNED, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7D1BC433E2 for ; Tue, 15 Sep 2020 12:44:45 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 528E020936 for ; Tue, 15 Sep 2020 12:44:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b0q9q0Dy" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 528E020936 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:49964 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kIAKB-0006Fc-VC for qemu-devel@archiver.kernel.org; Tue, 15 Sep 2020 08:44:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kI9r6-0001Db-Ez; Tue, 15 Sep 2020 08:14:40 -0400 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]:33319) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kI9r4-0008Fb-Le; Tue, 15 Sep 2020 08:14:40 -0400 Received: by mail-pg1-x52d.google.com with SMTP id s65so1917946pgb.0; Tue, 15 Sep 2020 05:14:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rY6yNgCy25oDmt+nU7EZEt8FaOeANESnxbsMxWp5WF0=; b=b0q9q0DyvBaiAJzZat5zEJ6o9CIjzb0/Z/ACPCtPIZcjX4uStpz1XxM4HWMjfD4YP4 HI84HfJBYtbALEMOFGyh4Zo10XMtu8ZIgDwvlGHc2QprcD6HB32skdGo+87EbZmHj4kj 35qJZcxcfC740XuG72xS2L43MU1lOrX7TNdv6XnyCy3mVyNRlgw7HaVDOQnjMpmgXw31 JIWbeX/OvJEA08RpUNWNAmsVhq8O8lITMAq+2Jm/JprAD+XcsQJSLaD0vVK0j/8/7IYy rCSsSJi3BY30jp+KDY51DzgUsCwsa4XWQCCjKBMj98QjTitFIVdVqJT6uaFUm2GdZH4c zPSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rY6yNgCy25oDmt+nU7EZEt8FaOeANESnxbsMxWp5WF0=; b=SUr9sk71OkVVL5gY4RxBfDmWshWcPUyuvXcslWpmBqhyBhAhBaQoLObZ4Y4kzNEq6m P5WGb8YiIJr/BySfWFJsI1DbLx98O1OyTJX5XWqRr/jG2ABIZ2/rcIkAmd3JLDKb9l87 STlE9lRjtmhhQ/V4bzd3TdawxK8i+KTNCHeezQBjAiVhGF9JZ8vDTS1CgKPa00M52bG2 dNwQhyse2RPAxDMWgKXcu47hHtrPlMD9vSzQZ41Jh5O+gtRLkK/kCdWfcRjwRE72Kj70 QsY47iyTGKDcDddqZQ7Ve4Na7IYep5koyM7m6L5djXd9Xt8rEYbgBZsXPehN5YRheAcD wDCg== X-Gm-Message-State: AOAM530cIXyrZWhCNkJ3ZbPT7Q5I3hOw6muQAnVEWfAqdl6B1aZ9SPnF 1XA0n2rnrAxg/B7fqyX2xQw1qpEvpAG5IcHPdTI= X-Google-Smtp-Source: ABdhPJwWOaPx4+19DtbCxJUMqbg0owjQT5P5Z0NAUYxLnRi478kj5Aobj4fJXAqlvC2vaPgivJ50GA== X-Received: by 2002:a62:1c0f:0:b029:13e:d13d:a05e with SMTP id c15-20020a621c0f0000b029013ed13da05emr17423937pfc.36.1600172076333; Tue, 15 Sep 2020 05:14:36 -0700 (PDT) Received: from localhost.localdomain ([103.94.185.75]) by smtp.googlemail.com with ESMTPSA id k28sm13683061pfh.196.2020.09.15.05.14.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 05:14:35 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v9 13/26] meson: remove empty else and duplicated gio deps Date: Tue, 15 Sep 2020 20:13:05 +0800 Message-Id: <20200915121318.247-14-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20200915121318.247-1-luoyonggang@gmail.com> References: <20200915121318.247-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52d; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x52d.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= , Ed Maste , Michael Roth , qemu-block@nongnu.org, Stefan Weil , Xie Changlong , Peter Lieven , Markus Armbruster , Max Reitz , Yonggang Luo , Gerd Hoffmann , Wen Congyang , Paolo Bonzini , Richard Henderson , Li-Wen Hsu Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Yonggang Luo Reviewed-by: Daniel P. Berrangé --- 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