From patchwork Wed Sep 9 09:46:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Yonggang Luo X-Patchwork-Id: 11765227 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 34B91112E for ; Wed, 9 Sep 2020 09:51:32 +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 DB22621D7A for ; Wed, 9 Sep 2020 09:51:31 +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="hOshdSmh" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DB22621D7A 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:48108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFwlG-0005Iv-MY for patchwork-qemu-devel@patchwork.kernel.org; Wed, 09 Sep 2020 05:51:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFwhR-0007HY-7s; Wed, 09 Sep 2020 05:47:33 -0400 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]:40244) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kFwhL-0007ki-Du; Wed, 09 Sep 2020 05:47:32 -0400 Received: by mail-pg1-x52c.google.com with SMTP id j34so1679481pgi.7; Wed, 09 Sep 2020 02:47:25 -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=30KkRCFEtXNka1aga0YHq3EqESHJABavOs610tDas18=; b=hOshdSmhDTzmww24DpGMW7nyBoMYJzcHkS7SS0kUGuNj4TO0Z9iQUw845TVBC2s7m4 sDilJBcbgGiU8euYz3Uemt2zEqcx8jBmfPuFiWbBO8m91dM35jPDR19uswlIg/RLbhlE 0qWJCF/kgC3RtoezlQExE3S41gbj9dmJEEiReKGnmYF/kjTzJ63qiyfejLj9xVBvT+ZB tcgylzrMKvwMi8gvUamP7BHKy3R2OeC/lB7F5LUIfpoNvKgh6GTHZrUaT+B7VxFn245K VmEPfLGm0pP8EiGhT6q/UxKQYqh3Y26P/EZpXKD7MfbGbE6P8Y9MOj4mn4RqevnfLUaf 3y0g== 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=30KkRCFEtXNka1aga0YHq3EqESHJABavOs610tDas18=; b=NynkNDgWOaH3edlMnc7x2Z2Kr9j3X9cAUc0XChAWUEpxm2s29vUmjJo/h+A8YmEcrQ HXKddozsr8nOb6Ftef92Rq84mfD3KhGHyPRuuit07Z3vnEZg8AYIES8hxJqSSoMxDaS2 kPiTZJ6gQDZJwK0x+hieE53i58TUFBAbaB48C5Tt0WeNPqDlF26RUs31xw8I6g6Bm1zj t4YQmVzj+DcbnQZnIy0ON3Jk4WB5JDyjdnJDoM7Uk7Tyt5StetomiReVXIFD9KLCirxm jv/fKSDq6Axkb24YSw2iIYaq3q/ieBHsCpD8jvf5VFb7mbkeMyv03wZ4hHWf1h1yutr5 ABkw== X-Gm-Message-State: AOAM530o/aUFHxs1Y9Ghgia6d+XyOSoiyvTWkVdGH9Uph9ZaDvQabAeq FD240xstgZelV2e9kzZlfNTGg4Vak5Z6nuBZ X-Google-Smtp-Source: ABdhPJzutvOQp7rgKMAS/3ZDlyVkDAmzSPvudA9ez3fS680rPc3jKBRW1L5UuidUrbJIqpVamvvapg== X-Received: by 2002:a17:902:d888:b029:d0:cb2d:f274 with SMTP id b8-20020a170902d888b02900d0cb2df274mr175043plz.13.1599644844631; Wed, 09 Sep 2020 02:47:24 -0700 (PDT) Received: from localhost.localdomain ([222.95.248.6]) by smtp.googlemail.com with ESMTPSA id 64sm1708312pgi.90.2020.09.09.02.47.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Sep 2020 02:47:23 -0700 (PDT) From: Yonggang Luo To: qemu-devel@nongnu.org Subject: [PATCH v2 12/21] meson: remove empty else and duplicated gio deps Date: Wed, 9 Sep 2020 17:46:08 +0800 Message-Id: <20200909094617.1582-13-luoyonggang@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 In-Reply-To: <20200909094617.1582-1-luoyonggang@gmail.com> References: <20200909094617.1582-1-luoyonggang@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52c; envelope-from=luoyonggang@gmail.com; helo=mail-pg1-x52c.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 , Ed Maste , Michael Roth , qemu-block@nongnu.org, Stefan Weil , Xie Changlong , Peter Lieven , Markus Armbruster , Max Reitz , Yonggang Luo , Gerd Hoffmann , Wen Congyang , Richard Henderson , Li-Wen Hsu Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.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 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