From patchwork Thu Sep 10 10:30:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 1361456 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=f2rmHPho; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 4BnFl21jkfz9sTd for ; Thu, 10 Sep 2020 20:39:58 +1000 (AEST) Received: from localhost ([::1]:39974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kGJzg-00056N-45 for incoming@patchwork.ozlabs.org; Thu, 10 Sep 2020 06:39:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51030) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kGJso-0000Zn-W3; Thu, 10 Sep 2020 06:32:51 -0400 Received: from mail-pf1-x434.google.com ([2607:f8b0:4864:20::434]:39101) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kGJsn-0003Dx-8B; Thu, 10 Sep 2020 06:32:50 -0400 Received: by mail-pf1-x434.google.com with SMTP id n14so4381851pff.6; Thu, 10 Sep 2020 03:32:48 -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=FMAHDxTONXsMLLCC/F2W4g5NRWoYLphvGLs4LjcpQd8=; b=f2rmHPhoxJaC5ujeeW5wQZjvXcrzJKzH9nH86dw+YKnSkO7Exo06FQ88QqHrHFaF9y bD7+wgj9c8uoI097yD3ZK2iyOS1iNlV1xn343LLbzDld7o5i/gB67TcFpk51cs+rxZ8C 2HfJ6I1+Sa73y8iDrXu7JPUN8thBPAfoEJAHN4vdJIEQzxXLG2tbBpFZnsA8MzpVlt/p OXrDKDj9pWN5yqytI2aUvU978gTAMoVy25px5QMIOlaYAJIiHNqh4oBlfiYQc+/LjLu7 sa7KqxQ7iu1kz0K7N3FvFjT4aK0Ki6lrPx6GUMg6wXQPlA6cgLx1fmO9CfQD9RLqhYqe cs+A== 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=FMAHDxTONXsMLLCC/F2W4g5NRWoYLphvGLs4LjcpQd8=; b=YFXHKDeE3EBQWOyQGRS1NUxL/uPpzGzr0vQVJNDyoMwAb6ieLp9qb24ebRvq4Z1Aaj aY+jfkSIrLD0Cx6nVEG+y/aKNeOcAUalKd0DQ153pzaTYILSUoevnknAMubyOYOAdLQv mg9wL83wACenITnGdQoVpQPL4LMJ7YKQqf4+fUwjpxbprWi/0Wq89AXhHTlw8B1pOjVr W+W0deNVTd4CinmWmX2KnhAccDwQ0OZOeQPDGlTarpRiVwny+2XZphoaBiF1GXT2Rg7A Xymwyd+L8R7b+0HOAguHLxd3xg3UngQrO0AHhNR0yowpR7mo4WxxHAzoiPagtT86kBQi kNHg== X-Gm-Message-State: AOAM532CTJB3fDzcN1KVWaROqCUWzedUHD5oyuPZbtnGq4nxMk91N0iF IsYJd+B0L2h9fPwvP7EWH5BnqTYVWfBhtM3EFTQ= X-Google-Smtp-Source: ABdhPJz/SCTSdZWFXkt78xd0tpANoCwP9N4/aWaMXAM6+H0D6moygB0T2xd5qocxvy1N4NqNtdGIPQ== X-Received: by 2002:a63:475d:: with SMTP id w29mr3787268pgk.287.1599733967167; Thu, 10 Sep 2020 03:32:47 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id g21sm2000203pfh.30.2020.09.10.03.32.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Sep 2020 03:32:46 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v7 15/25] meson: remove empty else and duplicated gio deps Date: Thu, 10 Sep 2020 18:30:49 +0800 Message-Id: <20200910103059.987-16-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20200910103059.987-1-luoyonggang@gmail.com> References: <20200910103059.987-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::434; envelope-from=luoyonggang@gmail.com; helo=mail-pf1-x434.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Yonggang Luo Reviewed-by: Daniel P. Berrangé Reviewed-by: Thomas Huth --- meson.build | 6 ------ 1 file changed, 6 deletions(-) diff --git a/meson.build b/meson.build index 5421eca66a..0b1741557d 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