From nobody Tue Nov 18 05:50:15 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608145284; cv=none; d=zohomail.com; s=zohoarc; b=jtL4IcgmF6kSg0aYqtuegyOsaxWu9r0qDP/B5vMgfB58gfwInlzfE9y5mEQKezHvysR5VHH89GQz/SY8GMX6T/yBGxPqOfJkaBHMkyGO0UfCVopF361+wExGXtm3JLdowS52QmjmVBX5FsUjVI30mWOdIDnkRIUpU8jhGnQbgEY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608145284; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7RAuAOiHtCEg/kAzL1aVWGDPXJpz9DMSzL+PQoGrz8I=; b=dh3Sf3f21+mp5AARBrv55CnNkE1v6923o2Nl8JAMAM44Wy0cQ8Thl0RaJvnKT4vmnGMFY/Bn3vd2qd3ZsR7iyrZzOWa4xZLFGHy6Q+ZoUw50rjE3M83gclbs8cYCNAsWeXUWBE3eC5SFa1zTopafT6RIad5Mnj/Vf0kMPm8kjYA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608145284153179.6744128498883; Wed, 16 Dec 2020 11:01:24 -0800 (PST) Received: from localhost ([::1]:36616 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpZeg-0003dU-9T for importer@patchew.org; Wed, 16 Dec 2020 11:27:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpZXB-0002AN-8p for qemu-devel@nongnu.org; Wed, 16 Dec 2020 11:20:14 -0500 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]:44205) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpZX9-0006Uc-6e for qemu-devel@nongnu.org; Wed, 16 Dec 2020 11:20:12 -0500 Received: by mail-ej1-x62a.google.com with SMTP id w1so28904602ejf.11 for ; Wed, 16 Dec 2020 08:20:10 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id a13sm21264501edb.76.2020.12.16.08.20.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 08:20:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7RAuAOiHtCEg/kAzL1aVWGDPXJpz9DMSzL+PQoGrz8I=; b=mqhNPk+V4KQiBUY9JhDWFDoK/CrSpyT2E7gi1rjQfmptOhBXWbFw0avCYQMimyXsKA sPYXQtwzVeW8VV5EfCFzMN1zA0uVWndPVMB5XfZ26bC20z9n3TgELhPy9RtkBurbaYrV Df/AefeBjdbZVG13rDZizF9Fb19dbvzaMO0JCtTWd7G+T4/rBYDtLvUXgQxbN5idNj5C FS+DGQhx1SJ2ub9FHFrZeVBvQ2KVbQHogs8idk/kWGxIZH7hzz/Fpy4cAn7mRZ6u46/G gVtoaGvfFc6tpICJ4B20t34Ple1SCobO0b47zr1TUPRH1KQ7+JMC9lT40Xb8Idl17OWW Y6uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7RAuAOiHtCEg/kAzL1aVWGDPXJpz9DMSzL+PQoGrz8I=; b=jD5whccugL117H/ePoafnSrNFEkOJ8zxVMtQmu6d/2oWe0E7eq8j1nRTRpv+yqS9G1 oEVNgxD6wsc3LsQjYSlCGXaxQg1ijQDAQPONbRUV72eQINC0nClnbahxC5OulX7sbm97 BzgCQihd9cWTHNQwFbY1mkLKdY03FBvX9YXcdAIJwqJqbXJpEgxgroZFDmkkZ51F8rLb oDyFXhNjoJ8l9WygddhY5m+vwA0S67S2Ay2FJqjX0JiINMKDqadQvKpalET+Wa1dV2dg cjV66BszlhN7bMT073zRW/Q8LEogWX3USff2IPSqEIVaiCW9OEVks81PIsGMsLczxeUr 18PA== X-Gm-Message-State: AOAM5322nWqVJvszD7IcKCvYtTRkUNHMkKJVFFjExhmXalkE6qqkaVsC VLAGSBQSNtDz60zYsa5yjmO/waiNpVw= X-Google-Smtp-Source: ABdhPJzEVc6t/8/G20ykUCb2yBq0Rrh234WNBrCQ90j9gZr9sckk6OoKti0PqTS87kW7OY5myPtNpw== X-Received: by 2002:a17:906:378f:: with SMTP id n15mr30808863ejc.263.1608135609290; Wed, 16 Dec 2020 08:20:09 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/7] Makefile: add dummy target for build.ninja dependencies Date: Wed, 16 Dec 2020 17:20:00 +0100 Message-Id: <20201216162006.433850-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201216162006.433850-1-pbonzini@redhat.com> References: <20201216162006.433850-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62a.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" The dummy targets ensure that incremental build can be done after deleting a meson.build file. Signed-off-by: Paolo Bonzini --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 76dbb917f5..fb9923ff22 100644 --- a/Makefile +++ b/Makefile @@ -133,6 +133,7 @@ Makefile.ninja: build.ninja =20 # A separate rule is needed for Makefile dependencies to avoid -n build.ninja: build.ninja.stamp +$(build-files): build.ninja.stamp: meson.stamp $(build-files) $(NINJA) $(if $V,-v,) build.ninja && touch $@ endif --=20 2.29.2 From nobody Tue Nov 18 05:50:15 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608152402; cv=none; d=zohomail.com; s=zohoarc; b=iunHpt+pdUWkVynjkw9vzTcMLkyO794tsk0TasNurdI83GM+BxKtY6phP+mRQw2vTT2uulAqftzZOoFdrMXpp0dMRVp2uMhvo8x/teJupCUae0UlukNptiVrtBuRVOhGlSWl22D5fmG5zOXDXti6rh8ydctH/BKVRtPkGiHNkAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608152402; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=8/RVYQc5F8sqm0EKxAYHKWrSyoP3ucjT0ePZdg6QJ0c=; b=HB2qyoB4JiV6doel4YYhuKBU4vGIqPBRter5l67YD6am9gA2udbZMPfZVyoNW8og2woHkgjruAFFahkI6XG25V1IXOxpFZqEQQYehxAr2aTw55y1dAKSVD/QA2sutCHpR7/SLnAk1224IusLu/N+1VtW/q2WIEXO387EXNKUQpo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608152402105694.7656505679104; Wed, 16 Dec 2020 13:00:02 -0800 (PST) Received: from localhost ([::1]:56538 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpZcp-000082-02 for importer@patchew.org; Wed, 16 Dec 2020 11:26:03 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpZXB-0002AO-8p for qemu-devel@nongnu.org; Wed, 16 Dec 2020 11:20:14 -0500 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]:33170) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpZX9-0006Ug-DO for qemu-devel@nongnu.org; Wed, 16 Dec 2020 11:20:12 -0500 Received: by mail-ej1-x629.google.com with SMTP id b9so8638707ejy.0 for ; Wed, 16 Dec 2020 08:20:11 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id a13sm21264501edb.76.2020.12.16.08.20.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 08:20:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8/RVYQc5F8sqm0EKxAYHKWrSyoP3ucjT0ePZdg6QJ0c=; b=LVFr2/ppRQyHFjCEitmGQg9fG8h7/VOV2zMTbzVwN7Ywf8O+kJflaR8hlmDl61InSZ 5CYdOn0C40cMoKTYKUrdLJeBj+ZzZBPN7rWzyf4bQ8smOPjqQi+O6q8gARGWSf2DKlYQ UZDYEv7ekM6YWceEehOpmiFivRzKQnetum9wRz0embQ4w7pJM8+t6h1bJT+oDhsnxRCp v9jOiqF+CNtFME45mUz4RgheOUSUt/PgWMK6/mMwlITZBp4GLv5ZCtJnjmNtBe2iozYe aecKqdvW8ngOZAj/zWptnNyhHgyjOF1k9DqnJ01S3Yz/o2qX6qF/RN74h13ub3hbJ3N6 cYjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=8/RVYQc5F8sqm0EKxAYHKWrSyoP3ucjT0ePZdg6QJ0c=; b=nMIV6T6C2r7wQp6why0zVD8lcoECGncbgy2iJZk2tzzORDdBobksWerkuxHH2fv21m KqRKlR4a+gzHBS5cTXbdXAaUijVKITel+bgrC9uGmY0UifsOeTKPJ0ZEfQ0PJfqTSEJv GAqG4TKt4ZuONw6svmL3iXwiKCmbN9R4KUElYiMH2/xi8zGnH8NWHquFDjNvpWsek1pV 4zfw8pJ8jzfnN9PAopzE2eiNp6x95NFPWMEKrdDHTTirHLWslcqx0L49BLYfGST88EBo gE1qn1/xmDHEqTYjOJ0ph0YmDBg/TgwT5vf31bVaUxLteFIty+z3CSoUlD+z52apjbqT L8RQ== X-Gm-Message-State: AOAM532ovsaQ1oPWAsoHWlf4iBauCwYO9HqbCjwaqAPqMJP3EOE1GOTN ZktMl8iPT8x2UJvK8KN6/mdxx7KPnNo= X-Google-Smtp-Source: ABdhPJwpN+zBJu+dCI/KCBYj4+FykcRt1fqqMxaxI43iFEw5zshGuUDqst+oqpXYxIqYdZc/xZdwzA== X-Received: by 2002:a17:906:34ca:: with SMTP id h10mr32064585ejb.417.1608135610152; Wed, 16 Dec 2020 08:20:10 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 2/7] meson: update submodule to 0.56.0 Date: Wed, 16 Dec 2020 17:20:01 +0100 Message-Id: <20201216162006.433850-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201216162006.433850-1-pbonzini@redhat.com> References: <20201216162006.433850-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x629.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Reviewed-by: Marc-Andr=C3=A9 Lureau --- configure | 2 +- meson | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 6317964997..8d12b715e3 100755 --- a/configure +++ b/configure @@ -1938,7 +1938,7 @@ python_version=3D$($python -c 'import sys; print("%d.= %d.%d" % (sys.version_info[0] python=3D"$python -B" =20 if test -z "$meson"; then - if test "$explicit_python" =3D no && has meson && version_ge "$(meson = --version)" 0.55.3; then + if test "$explicit_python" =3D no && has meson && version_ge "$(meson = --version)" 0.56.0; then meson=3Dmeson elif test -e "${source_path}/.git" && test $git_update =3D 'yes' ; then meson=3Dgit diff --git a/meson b/meson index 776acd2a80..f16d31607e 160000 --- a/meson +++ b/meson @@ -1 +1 @@ -Subproject commit 776acd2a805c9b42b4f0375150977df42130317f +Subproject commit f16d31607eb3cd0f281758bd0944e206ef6be387 --=20 2.29.2 From nobody Tue Nov 18 05:50:15 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608147015; cv=none; d=zohomail.com; s=zohoarc; b=Q4d9X1b4mcludfQ1Vs/f6m03bTtq9zfOqfJINWv7mTyvlS9e8s5DONsGm8F9WEys2RgHp5GlVwT6OxfipXEYsEUpZlWaUWVbJn4/cxy98N+vU3COTfDkV7iDXOuM5eAWmDsZ65m3gjrn/J+15uL09J0hA8Wya6k6hKw3/CNv4/I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608147015; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/MzUl6qav6DlTh4FgD5iqMGZ7LoRhAPDQS1hxgDUNfM=; b=d4lhu3XONh9Yd9GJp4nlpm/yEOeh9vaAnU/1hwXU2frxZmqnWf3KvBZOliwFcSgq8Q03LSlfvYknBuWG9EZAKef3sNPQShbgVcaKLk2Zac0nJPP6KLksC/SOTWCCGngdVE3xCoXZYe3CJLxs2yEP4FcOMUW5m+EB3R66BRLfTjE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608147015009256.64571958100703; Wed, 16 Dec 2020 11:30:15 -0800 (PST) Received: from localhost ([::1]:53698 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpZbe-0007N5-4E for importer@patchew.org; Wed, 16 Dec 2020 11:24:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58978) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpZXF-0002ED-2w for qemu-devel@nongnu.org; Wed, 16 Dec 2020 11:20:18 -0500 Received: from mail-ej1-x62c.google.com ([2a00:1450:4864:20::62c]:34089) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpZXB-0006Uo-2E for qemu-devel@nongnu.org; Wed, 16 Dec 2020 11:20:15 -0500 Received: by mail-ej1-x62c.google.com with SMTP id g20so33598578ejb.1 for ; Wed, 16 Dec 2020 08:20:12 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id a13sm21264501edb.76.2020.12.16.08.20.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 08:20:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/MzUl6qav6DlTh4FgD5iqMGZ7LoRhAPDQS1hxgDUNfM=; b=uYolXSl+PrNz1CfMH0erF2Ciin4G48qWQAICm+ucxH01Tu2/pqZSWfLJNn4LzxHYP7 uUjBzzZ8GVlGwDUZmPjA4aXTcp3aW3Tvt7p0z/9O8FVlwzA8iwkI7t9cYq4xPHvKKzmw ybcsepiBhQ8rH4F7DUJFbdkbHorHemTN8FPJrk5xUvzNYepU6b7hqLhJG0dQ9zYYMNCa dnfJTsePlzE0MP0ByiFo73PPVkjiGnIMz+5gaQNGNAR/IMElQJOkZre4MbTaI7rPp0z/ AUnwP0dtKOwaD+9BLilDX0mPx8dzziBzfWkMUj3yllZrs7lixwvQlJVOCbnosTLbUU8u RTNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/MzUl6qav6DlTh4FgD5iqMGZ7LoRhAPDQS1hxgDUNfM=; b=kyeSPxE+xtj3fMFfh2bqqu7qC01wCCECxbCczMB/e1JS1WznSjaFmDTr9rsCicnHH2 gtv3y2tflqb79US7PEfBTY8LtPAehI6mCTPGXAHXqIYZ1iRStRJd+c564ogW+B0Fbh9H 1aYSeTJbKyLVwgA5+q8zpbv6OXtht+1RRNJqphz16IhXbGtoyLhZYMcD33L1o0Sgfp5i Wfwa1GPMBap6iw6KTq7sSUv6/4QP3jhMO8PCCk9agkTYQLHPuwXPYc6F/h99xuh4AiL1 pj6YMq6wCI3sVMdMBiHQS94CCH1wlBKjQWeDmouYXbF/Nf3F5+ezJXyon5r33Im/l1bZ kHpg== X-Gm-Message-State: AOAM5313/WmTYElZG3t6ESy8/4NHHuRDVHUiaYiU09wF4qKVww77BrOc j4jewiatVAeXb03ZJ/dWtjoIYm4V+2U= X-Google-Smtp-Source: ABdhPJyaw8B/I/8qqaCnieNhigm3wNalI5VbPD2OQx/j94iI1dDH4g1bQPPGFfRRY1qCyNhGXD2aCg== X-Received: by 2002:a17:906:3c04:: with SMTP id h4mr30791288ejg.220.1608135611305; Wed, 16 Dec 2020 08:20:11 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 3/7] meson: switch minimum meson version to 0.56.0 Date: Wed, 16 Dec 2020 17:20:02 +0100 Message-Id: <20201216162006.433850-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201216162006.433850-1-pbonzini@redhat.com> References: <20201216162006.433850-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62c; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62c.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Meson 0.56.0 does not need b_staticpic=3D$pie anymore, and has stabilized the keyval module. Remove the workaround and use a few replacements for features deprecated in that release cycle. Signed-off-by: Paolo Bonzini Reviewed-by: Marc-Andr=C3=A9 Lureau --- configure | 5 ---- docs/meson.build | 12 ++++---- meson.build | 54 ++++++++++++++++------------------- plugins/meson.build | 4 +-- tests/meson.build | 2 +- tests/qapi-schema/meson.build | 4 +-- tests/qtest/meson.build | 2 +- trace/meson.build | 4 +-- 8 files changed, 39 insertions(+), 48 deletions(-) diff --git a/configure b/configure index 8d12b715e3..708cf365f0 100755 --- a/configure +++ b/configure @@ -6965,10 +6965,6 @@ fi mv $cross config-meson.cross =20 rm -rf meson-private meson-info meson-logs -unset staticpic -if ! version_ge "$($meson --version)" 0.56.0; then - staticpic=3D$(if test "$pie" =3D yes; then echo true; else echo false; f= i) -fi NINJA=3D$ninja $meson setup \ --prefix "$prefix" \ --libdir "$libdir" \ @@ -6988,7 +6984,6 @@ NINJA=3D$ninja $meson setup \ -Dwerror=3D$(if test "$werror" =3D yes; then echo true; else echo = false; fi) \ -Dstrip=3D$(if test "$strip_opt" =3D yes; then echo true; else ech= o false; fi) \ -Db_pie=3D$(if test "$pie" =3D yes; then echo true; else echo fals= e; fi) \ - ${staticpic:+-Db_staticpic=3D$staticpic} \ -Db_coverage=3D$(if test "$gcov" =3D yes; then echo true; else ech= o false; fi) \ -Db_lto=3D$lto -Dcfi=3D$cfi -Dcfi_debug=3D$cfi_debug \ -Dmalloc=3D$malloc -Dmalloc_trim=3D$malloc_trim -Dsparse=3D$sparse= \ diff --git a/docs/meson.build b/docs/meson.build index bb8fe4c9e4..4e88ed7516 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -38,12 +38,12 @@ endif if build_docs SPHINX_ARGS +=3D ['-Dversion=3D' + meson.project_version(), '-Drelease= =3D' + config_host['PKGVERSION']] =20 - sphinx_extn_depends =3D [ meson.source_root() / 'docs/sphinx/depfile.py', - meson.source_root() / 'docs/sphinx/hxtool.py', - meson.source_root() / 'docs/sphinx/kerneldoc.py', - meson.source_root() / 'docs/sphinx/kernellog.py', - meson.source_root() / 'docs/sphinx/qapidoc.py', - meson.source_root() / 'docs/sphinx/qmp_lexer.py', + sphinx_extn_depends =3D [ meson.current_source_dir() / 'sphinx/depfile.p= y', + meson.current_source_dir() / 'sphinx/hxtool.py', + meson.current_source_dir() / 'sphinx/kerneldoc.p= y', + meson.current_source_dir() / 'sphinx/kernellog.p= y', + meson.current_source_dir() / 'sphinx/qapidoc.py', + meson.current_source_dir() / 'sphinx/qmp_lexer.p= y', qapi_gen_depends ] =20 configure_file(output: 'index.html', diff --git a/meson.build b/meson.build index 77ac9ec01b..39fc9b7143 100644 --- a/meson.build +++ b/meson.build @@ -1,14 +1,10 @@ -project('qemu', ['c'], meson_version: '>=3D0.55.0', - default_options: ['warning_level=3D1', 'c_std=3Dgnu99', 'cpp_std= =3Dgnu++11', 'b_colorout=3Dauto'] + - (meson.version().version_compare('>=3D0.56.0') ? = [ 'b_staticpic=3Dfalse' ] : []), - version: run_command('head', meson.source_root() / 'VERSION').stdo= ut().strip()) +project('qemu', ['c'], meson_version: '>=3D0.56.0', + default_options: ['warning_level=3D1', 'c_std=3Dgnu99', 'cpp_std= =3Dgnu++11', 'b_colorout=3Dauto', + 'b_staticpic=3Dfalse'], + version: run_command('head', meson.project_source_root() / 'VERSIO= N').stdout().strip()) =20 not_found =3D dependency('', required: false) -if meson.version().version_compare('>=3D0.56.0') - keyval =3D import('keyval') -else - keyval =3D import('unstable-keyval') -endif +keyval =3D import('keyval') ss =3D import('sourceset') fs =3D import('fs') =20 @@ -1372,21 +1368,21 @@ genh +=3D configure_file(output: 'config-host.h', c= onfiguration: config_host_data) hxtool =3D find_program('scripts/hxtool') shaderinclude =3D find_program('scripts/shaderinclude.pl') qapi_gen =3D find_program('scripts/qapi-gen.py') -qapi_gen_depends =3D [ meson.source_root() / 'scripts/qapi/__init__.py', - meson.source_root() / 'scripts/qapi/commands.py', - meson.source_root() / 'scripts/qapi/common.py', - meson.source_root() / 'scripts/qapi/error.py', - meson.source_root() / 'scripts/qapi/events.py', - meson.source_root() / 'scripts/qapi/expr.py', - meson.source_root() / 'scripts/qapi/gen.py', - meson.source_root() / 'scripts/qapi/introspect.py', - meson.source_root() / 'scripts/qapi/parser.py', - meson.source_root() / 'scripts/qapi/schema.py', - meson.source_root() / 'scripts/qapi/source.py', - meson.source_root() / 'scripts/qapi/types.py', - meson.source_root() / 'scripts/qapi/visit.py', - meson.source_root() / 'scripts/qapi/common.py', - meson.source_root() / 'scripts/qapi-gen.py' +qapi_gen_depends =3D [ meson.current_source_dir() / 'scripts/qapi/__init__= .py', + meson.current_source_dir() / 'scripts/qapi/commands.p= y', + meson.current_source_dir() / 'scripts/qapi/common.py', + meson.current_source_dir() / 'scripts/qapi/error.py', + meson.current_source_dir() / 'scripts/qapi/events.py', + meson.current_source_dir() / 'scripts/qapi/expr.py', + meson.current_source_dir() / 'scripts/qapi/gen.py', + meson.current_source_dir() / 'scripts/qapi/introspect= .py', + meson.current_source_dir() / 'scripts/qapi/parser.py', + meson.current_source_dir() / 'scripts/qapi/schema.py', + meson.current_source_dir() / 'scripts/qapi/source.py', + meson.current_source_dir() / 'scripts/qapi/types.py', + meson.current_source_dir() / 'scripts/qapi/visit.py', + meson.current_source_dir() / 'scripts/qapi/common.py', + meson.current_source_dir() / 'scripts/qapi-gen.py' ] =20 tracetool =3D [ @@ -1894,14 +1890,14 @@ foreach target : target_dirs if target.endswith('-softmmu') execs =3D [{ 'name': 'qemu-system-' + target_name, - 'gui': false, + 'win_subsystem': 'console', 'sources': files('softmmu/main.c'), 'dependencies': [] }] if targetos =3D=3D 'windows' and (sdl.found() or gtk.found()) execs +=3D [{ 'name': 'qemu-system-' + target_name + 'w', - 'gui': true, + 'win_subsystem': 'windows', 'sources': files('softmmu/main.c'), 'dependencies': [] }] @@ -1910,7 +1906,7 @@ foreach target : target_dirs specific_fuzz =3D specific_fuzz_ss.apply(config_target, strict: fals= e) execs +=3D [{ 'name': 'qemu-fuzz-' + target_name, - 'gui': false, + 'win_subsystem': 'console', 'sources': specific_fuzz.sources(), 'dependencies': specific_fuzz.dependencies(), }] @@ -1918,7 +1914,7 @@ foreach target : target_dirs else execs =3D [{ 'name': 'qemu-' + target_name, - 'gui': false, + 'win_subsystem': 'console', 'sources': [], 'dependencies': [] }] @@ -1933,7 +1929,7 @@ foreach target : target_dirs link_language: link_language, link_depends: [block_syms, qemu_syms] + exe.get('link_depen= ds', []), link_args: link_args, - gui_app: exe['gui']) + win_subsystem: exe['win_subsystem']) } =20 if 'CONFIG_TRACE_SYSTEMTAP' in config_host diff --git a/plugins/meson.build b/plugins/meson.build index e77723010e..d58efc980e 100644 --- a/plugins/meson.build +++ b/plugins/meson.build @@ -1,7 +1,7 @@ if 'CONFIG_HAS_LD_DYNAMIC_LIST' in config_host - plugin_ldflags =3D ['-Wl,--dynamic-list=3D' + (meson.build_root() / 'qem= u-plugins-ld.symbols')] + plugin_ldflags =3D ['-Wl,--dynamic-list=3D' + (meson.project_build_root(= ) / 'qemu-plugins-ld.symbols')] elif 'CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST' in config_host - plugin_ldflags =3D ['-Wl,-exported_symbols_list,' + (meson.build_root() = / 'qemu-plugins-ld64.symbols')] + plugin_ldflags =3D ['-Wl,-exported_symbols_list,' + (meson.project_build= _root() / 'qemu-plugins-ld64.symbols')] else plugin_ldflags =3D [] endif diff --git a/tests/meson.build b/tests/meson.build index 1fa068f27b..0b8c3c6f32 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -113,7 +113,7 @@ tests =3D { 'test-keyval': [testqapi], 'test-logging': [], 'test-uuid': [], - 'ptimer-test': ['ptimer-test-stubs.c', meson.source_root() / 'hw/core/pt= imer.c'], + 'ptimer-test': ['ptimer-test-stubs.c', meson.project_source_root() / 'hw= /core/ptimer.c'], 'test-qapi-util': [], } =20 diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build index 304ef939bd..26588396d2 100644 --- a/tests/qapi-schema/meson.build +++ b/tests/qapi-schema/meson.build @@ -1,5 +1,5 @@ test_env =3D environment() -test_env.set('PYTHONPATH', meson.source_root() / 'scripts') +test_env.set('PYTHONPATH', meson.project_source_root() / 'scripts') test_env.set('PYTHONIOENCODING', 'utf-8') =20 schemas =3D [ @@ -240,7 +240,7 @@ if build_docs # clutter up the build dir with the cache. command: [SPHINX_ARGS, '-b', 'text', '-E', - '-c', meson.source_root() / 'docs= ', + '-c', meson.project_source_root()= / 'docs', '-D', 'master_doc=3Ddoc-good', meson.current_source_dir(), meson.current_build_dir()]) diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 6a67c538be..450af3e51c 100644 --- a/tests/qtest/meson.build +++ b/tests/qtest/meson.build @@ -237,7 +237,7 @@ foreach dir : target_dirs qtest_env.set('QTEST_QEMU_IMG', './qemu-img') test_deps +=3D [qemu_img] endif - qtest_env.set('G_TEST_DBUS_DAEMON', meson.source_root() / 'tests/dbus-vm= state-daemon.sh') + qtest_env.set('G_TEST_DBUS_DAEMON', meson.project_source_root() / 'tests= /dbus-vmstate-daemon.sh') qtest_env.set('QTEST_QEMU_BINARY', './qemu-system-' + target_base) =20 foreach test : target_qtests diff --git a/trace/meson.build b/trace/meson.build index b19309b327..012d0dbceb 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -2,7 +2,7 @@ specific_ss.add(files('control-target.c')) =20 trace_events_files =3D [] foreach dir : [ '.' ] + trace_events_subdirs - trace_events_file =3D meson.source_root() / dir / 'trace-events' + trace_events_file =3D meson.project_source_root() / dir / 'trace-events' trace_events_files +=3D [ trace_events_file ] group_name =3D dir =3D=3D '.' ? 'root' : dir.underscorify() group =3D '--group=3D' + group_name @@ -68,7 +68,7 @@ foreach d : [ ] gen =3D custom_target(d[0], output: d[0], - input: meson.source_root() / 'trace-events', + input: meson.project_source_root() / 'trace-events', command: [ tracetool, '--group=3Droot', '--format=3D@0@'.f= ormat(d[1]), '@INPUT@' ], capture: true) specific_ss.add(when: 'CONFIG_TCG', if_true: gen) --=20 2.29.2 From nobody Tue Nov 18 05:50:15 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608158810; cv=none; d=zohomail.com; s=zohoarc; b=eHwatBeJg4aTATzx+srams19kfkEVcwYaW4swtTau4T+d1KRDq+6RQTJM7jP1syKaLwZO8BsMZoKqrOeqwWb86nZOPEcxaVe8CAF6P9Rl168Rzue5x/xvsU/YFH2qgAVBzc7o/ZR0oyYFpOnZ9iIjmiODIt+3c9ANcXGSdjgVFs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608158810; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2rZGYORyv9W21igfeV17FlgKIscLvsjmR+GC11LOjM4=; b=GgBJRhrjaMreJiVXAhmgvaEOjIRz96P+r7207xgMFfv+Fxcrcz2UMd8jDxG/QydNZHCrPq3hxZEToTref4loMP3WNaYit+BcUc4cR+IC20chsHc0IjECiL+OhaWUqpR/Zx9qmue/q/EpH881vjOJU/DsSVp1ODB7ZxXVtigDyDc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608158810257736.5824798209999; Wed, 16 Dec 2020 14:46:50 -0800 (PST) Received: from localhost ([::1]:51780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpZas-0006be-6f for importer@patchew.org; Wed, 16 Dec 2020 11:24:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58948) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpZXD-0002DF-Eq for qemu-devel@nongnu.org; Wed, 16 Dec 2020 11:20:16 -0500 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]:41535) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpZXB-0006Uv-Vd for qemu-devel@nongnu.org; Wed, 16 Dec 2020 11:20:15 -0500 Received: by mail-ej1-x636.google.com with SMTP id ce23so33566955ejb.8 for ; Wed, 16 Dec 2020 08:20:12 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id a13sm21264501edb.76.2020.12.16.08.20.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 08:20:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2rZGYORyv9W21igfeV17FlgKIscLvsjmR+GC11LOjM4=; b=fkzgLJpgjufYxW5xY223vyP9kgSAA6BBEelqKNIz5jNuxUB/JEHXRoFoKBDAfAnqF9 OVPlo8ZyAqTR2jt0kGIm/4FoRjnSqRpNMjt07WGfIGb1hyV9QFnNbnVX7HQf8XkXcfGX ANKoryeArArEZhUXLHK6+K9tVMEGOjewASKk3DXthgYSeiEmR9YPuMLQH7kTBPq41y3s eXdlgGGrygzjsPzfCkwzPd5sJFCQo2X7CoFEZrXTV4eWYpaqrcXUG2lhGkZmMXtei8fA Pg9SYUb09oG8bAwT6dy2OYFGTNJCsAO6Be18cgwhekxLOUHFvLoE57bd1ujw9ASMweRH KU+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2rZGYORyv9W21igfeV17FlgKIscLvsjmR+GC11LOjM4=; b=axC6eOyGIXvtHJhaAhVLkd1FbrhZ0HCmMDAn52CTHcl9IERRvigg1kOGzGfuJAw9fU ygTCMg4Ys8u7LVnMxDYzZ/Feoi4HafVyjG49g7xlXwtsOLlvmP9JSjJjQccXIsovri4G /PMj2eYh8zzFTm1xxcI7wHr+TWUVoTaHDTwtJueE9F4gINsFMG+6fcWFX7Zfo5W2IH8h Ch6Ex2xIAhrpbRAhkvep8+ZzXuP+GJ+u2bxqPzD0HQbr6pIyOOpDGNX0yi4ICTBRKYXJ FURDEUqgSvi1QhoajfkAAc6diR6VycIalf0r0W1clWrulgn+qDhj1Ytq0NLMiU5qpko2 XZXQ== X-Gm-Message-State: AOAM530qCsrAOqHTE3Y/46VRV9Ohrv9dTp1K9s+L5d1aXLpWDUls5yFk mmufiP5aCxx3vETO0WpWBbxkPtEMbro= X-Google-Smtp-Source: ABdhPJzkYuHRXGAOJpR5rofZC0S0Qtkjj9R6FUu5KqkK9wjIAE+lp+/SzKe6V//ER+h3DCw48V9RRQ== X-Received: by 2002:a17:906:4e45:: with SMTP id g5mr8150712ejw.391.1608135612145; Wed, 16 Dec 2020 08:20:12 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 4/7] meson: fix detection of curses with pkgconfig Date: Wed, 16 Dec 2020 17:20:03 +0100 Message-Id: <20201216162006.433850-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201216162006.433850-1-pbonzini@redhat.com> References: <20201216162006.433850-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x636.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini Reviewed-by: Marc-Andr=C3=A9 Lureau --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 39fc9b7143..ab622ae8bd 100644 --- a/meson.build +++ b/meson.build @@ -500,16 +500,16 @@ if have_system and not get_option('curses').disabled() endif endforeach msg =3D get_option('curses').enabled() ? 'curses library not found' : '' + curses_compile_args =3D ['-DNCURSES_WIDECHAR'] if curses.found() - if cc.links(curses_test, dependencies: [curses]) - curses =3D declare_dependency(compile_args: '-DNCURSES_WIDECHAR', de= pendencies: [curses]) + if cc.links(curses_test, args: curses_compile_args, dependencies: [cur= ses]) + curses =3D declare_dependency(compile_args: curses_compile_args, dep= endencies: [curses]) else msg =3D 'curses package not usable' curses =3D not_found endif endif if not curses.found() - curses_compile_args =3D ['-DNCURSES_WIDECHAR'] has_curses_h =3D cc.has_header('curses.h', args: curses_compile_args) if targetos !=3D 'windows' and not has_curses_h message('Trying with /usr/include/ncursesw') --=20 2.29.2 From nobody Tue Nov 18 05:50:15 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608158990; cv=none; d=zohomail.com; s=zohoarc; b=YHyZ8zVe3jS/mJ4Msc5MXXGjfanbiuj9thLs0E67y2zLY+NBv9IwNY424Ddm4ne/Eg+4mBs5G9TgxnI3XXtdUKZqb7PlGa6OPUMfqtu6/Y4QhiAFwSERJxKJF3weHWMDVu+px0jbMz/29mBw50ouH2duWR2/4HV0X4vU0LV1Xbg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608158990; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pMAHW/lOSnDs+tvYYnVBZJWjJu+36lZF4Eh2q1Iet6M=; b=oKIfsuvIcuiVHH4OWfIq95tTTehfUDG90V7ScMSTmgneIDvGXDRF9JONGQbvHSBJwbuWgjQmMPRWLQTqGmUNVmAMqperP3rcSv/vM307jZG492ReEfZYT0es2nDKa3M3usiP5bV4NpXtAYMNVBg5de1jBoprvqBPlU6o8t3AVwg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608158990515764.2578509277533; Wed, 16 Dec 2020 14:49:50 -0800 (PST) Received: from localhost ([::1]:40398 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpZfm-0005Fi-Ml for importer@patchew.org; Wed, 16 Dec 2020 11:29:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58980) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpZXF-0002EE-3g for qemu-devel@nongnu.org; Wed, 16 Dec 2020 11:20:18 -0500 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]:39262) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpZXC-0006V9-6O for qemu-devel@nongnu.org; Wed, 16 Dec 2020 11:20:16 -0500 Received: by mail-ej1-x631.google.com with SMTP id n26so33538108eju.6 for ; Wed, 16 Dec 2020 08:20:13 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id a13sm21264501edb.76.2020.12.16.08.20.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 08:20:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pMAHW/lOSnDs+tvYYnVBZJWjJu+36lZF4Eh2q1Iet6M=; b=dlAy3Zx5vrGFJyl+vypFGaBROPbvcdLph5HfmfW16gyIzlWAOvqKGK2QhP91d6TbtZ 1WKKzgoZJoCPQSiKGnv2xUahGYG+YqkOeWqkT/8EkyF37lw9ZNt3S2KZwcfM5WstSdXl SBj/eFHx5g1a0/VDql1Ufv0WuWz0w2mGxYezaObCbytAYM7wJPtcAE2gSdj8jK4K6+62 3xRK0cQ3SltKIrTfB5139ovG58uRHDTP2e32/83htubWxFcXNQq7RLIHChD8YG/Z8tT+ dPLlkO4uJjyDIIcz0vOFtqf5FtFHOSdhO9eMZkI23twxOHDrbSRGwIYVhlEeGZeLwJpp fTWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pMAHW/lOSnDs+tvYYnVBZJWjJu+36lZF4Eh2q1Iet6M=; b=BSf7gNXlLP6iJekshfxd1MgV0QkFhhVp+e0ccXY1Xxs0meMdsoXXibbaN4u7a+CaM3 rFfYO4AXYqG1MGxejxfp3Q6EfkR13b8/GI5zjVngNMGLqTatImyWUSAOYoRLJQfdpd9D ae/Zxwc2uwrNOfyM+ZZMrRglfBb5qM6iaNOiUQGcVBJAfD556UWNL4Hb/zYQKIzR44rK hpipPKjciGsyZNbslgaasrZktIDBAHVnTbRy3yar+BQHanNTY0CC8u4Xu9AlSMF0zvAj XCQjauim8DYLer+QOeopE2zI4Kgh+W0fVN7AJRfqxnT4tc0nlGEVEYJ7dHH6t1H1IegR 93HA== X-Gm-Message-State: AOAM531YxVojKW1FFQUqFIoVUU8Px1QeNu6aLORzuyTBxUD8jl0Gr7ku /X/4CC1hhLgy2wmGF+vKWtiC+NylDOY= X-Google-Smtp-Source: ABdhPJwoojxjXHPAv5STlbaFAPyWkZyQbpXKCpeuDhmMCtSHLfw0jev2C/l9Ubxi4zsWojw/Qe0/Fw== X-Received: by 2002:a17:906:5f97:: with SMTP id a23mr20411053eju.128.1608135612921; Wed, 16 Dec 2020 08:20:12 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 5/7] meson: use pkg-config method for libudev Date: Wed, 16 Dec 2020 17:20:04 +0100 Message-Id: <20201216162006.433850-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201216162006.433850-1-pbonzini@redhat.com> References: <20201216162006.433850-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x631.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Do not bother asking CMake, this is a pkg-config dependency. Signed-off-by: Paolo Bonzini --- meson.build | 1 + 1 file changed, 1 insertion(+) diff --git a/meson.build b/meson.build index ab622ae8bd..0b36fb38f1 100644 --- a/meson.build +++ b/meson.build @@ -399,6 +399,7 @@ endif libudev =3D not_found if targetos =3D=3D 'linux' and (have_system or have_tools) libudev =3D dependency('libudev', + method: 'pkg-config', required: get_option('libudev'), static: enable_static) endif --=20 2.29.2 From nobody Tue Nov 18 05:50:15 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608148106; cv=none; d=zohomail.com; s=zohoarc; b=HcOIBtWiG9bi6S7RSlnIRf2pr+C3m+wSJTW2uUHVp+P2WGPNcxlx8sEqLY8d2SaeTusoEIklR3t4lR3DiFDT5+OMdSlvZYzqq27P14sDKRmOw8QDOMtAcyt6TAHBT38hhRonVbsF9YIfFU1B6BbhGtzLMrNik6uTFZVagDypsZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608148106; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fVM1InpNhRI/g9ZYU2u7pE3PbR6QDiLKhPiZwnr0RDE=; b=FG4AZYEcY4H9sQ3GUbfgK8vRcOSyYwO5/NiKk7/fB2ElwN6C47C5SrgZWoXomU60N3jS3OiCqIhFn14LNfhAyzXjAKzdtwswSvY9D63qiFJ2H0/MldKsiTDMkb8vYxCYc6XXWqVxm8IEZX5x/3slwN7n69vpVKlJwflVsDoT3J4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608148105881704.7243988510093; Wed, 16 Dec 2020 11:48:25 -0800 (PST) Received: from localhost ([::1]:60196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpZdT-0001jv-Jg for importer@patchew.org; Wed, 16 Dec 2020 11:26:43 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpZXF-0002EC-2a for qemu-devel@nongnu.org; Wed, 16 Dec 2020 11:20:18 -0500 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]:34099) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpZXD-0006VI-2J for qemu-devel@nongnu.org; Wed, 16 Dec 2020 11:20:16 -0500 Received: by mail-ej1-x636.google.com with SMTP id g20so33598822ejb.1 for ; Wed, 16 Dec 2020 08:20:14 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id a13sm21264501edb.76.2020.12.16.08.20.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 08:20:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fVM1InpNhRI/g9ZYU2u7pE3PbR6QDiLKhPiZwnr0RDE=; b=gYbIwX2cOchXrs9tcbuBuZgSt+DIGRQcJSPqWPOorzlio5z8ip9FDMj7Vab9hXGZdw SOgPqRJVEW9ERLcKbanjtQVwtYb9GKRCaNqQ1y0CfXmufy1alTkJUhbsYF3phQ1XDGeH kDS6ZnYt5/4GmCPBdCn278B1aOuxEMzUqanIIUZPwDIo7ROKcHxwTjBw0PphY8/ahxH9 d1IhZfGE0dzZTbflivc4UNS9f553XZ3w/UNNmYNKowQ02i7pRneAzpexRsj79GCFcv+5 +3bge4E57sBZpLKFGq8YqppJ/wFyD509x4VOXdVbNTq1Py4UTm+S6Cuzt1SDrO6ctkKD jlLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=fVM1InpNhRI/g9ZYU2u7pE3PbR6QDiLKhPiZwnr0RDE=; b=Hs9qwSVeUdxxMKNe+dA+/cPbNfC8+ivawHYWL8Sm+pXBhklNttIfbRSiqzeE0hIv/L 48wMWgTHmSGGnO1g1R6GPHLTMXDMPV9c2/xrXBzZXwJArh9aivVFoC91TTwDzyjcdaQu dB0KpCGnB6bFnxpbgQV++NG5nSpptjY1Ncl2lTDPVEGCeCp7FNVSdwDSLkP6hxaij3Jr s1p7Vi0YvNU6Nd9A7zyDqTfiR2aR/BD4ObRU+JsqdK3G9K+rjedQ/r7BqHfV+p8n6iFZ 2qURfgojfgNa84LhxEIX5NsI4dOMqGL2aFKtkz2YkELmtll9Vdm0stsRk9DArgzE0tRg IXuA== X-Gm-Message-State: AOAM5304iK+91apKt0uvuAHDcWPZIuRcW3hKcFa6lwFPFpoeP/96nVZ/ qKTo/GD0WynGfL376Rah9R+CVejGteA= X-Google-Smtp-Source: ABdhPJyXQBOrMWTzFO52f7GAwqA9g/UWJv+oB7Bjbyua4BVGavAk7bY7NAW+4Bmz+oS8PRgsiDhUig== X-Received: by 2002:a17:906:924a:: with SMTP id c10mr31256404ejx.113.1608135613837; Wed, 16 Dec 2020 08:20:13 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 6/7] meson: use dependency to gate block modules Date: Wed, 16 Dec 2020 17:20:05 +0100 Message-Id: <20201216162006.433850-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201216162006.433850-1-pbonzini@redhat.com> References: <20201216162006.433850-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x636.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" This will allow converting the dependencies to meson options one by one, because moving the tests to meson.build will get rid of the symbols in config-host.mak. Signed-off-by: Paolo Bonzini Reviewed-by: Marc-Andr=C3=A9 Lureau --- block/meson.build | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/block/meson.build b/block/meson.build index 5dcc1e5cce..b02cb14aad 100644 --- a/block/meson.build +++ b/block/meson.build @@ -70,14 +70,14 @@ block_modules =3D {} =20 modsrc =3D [] foreach m : [ - ['CONFIG_CURL', 'curl', [curl, glib], 'curl.c'], - ['CONFIG_GLUSTERFS', 'gluster', glusterfs, 'gluster.c'], - ['CONFIG_LIBISCSI', 'iscsi', libiscsi, 'iscsi.c'], - ['CONFIG_LIBNFS', 'nfs', libnfs, 'nfs.c'], - ['CONFIG_LIBSSH', 'ssh', libssh, 'ssh.c'], - ['CONFIG_RBD', 'rbd', rbd, 'rbd.c'], + [curl, 'curl', [curl, glib], 'curl.c'], + [glusterfs, 'gluster', glusterfs, 'gluster.c'], + [libiscsi, 'iscsi', libiscsi, 'iscsi.c'], + [libnfs, 'nfs', libnfs, 'nfs.c'], + [libssh, 'ssh', libssh, 'ssh.c'], + [rbd, 'rbd', rbd, 'rbd.c'], ] - if config_host.has_key(m[0]) + if m[0].found() if enable_modules modsrc +=3D files(m[3]) endif @@ -90,10 +90,10 @@ endforeach # those are not exactly regular block modules, so treat them apart if 'CONFIG_DMG' in config_host foreach m : [ - ['CONFIG_LZFSE', 'dmg-lzfse', liblzfse, 'dmg-lzfse.c'], - ['CONFIG_BZIP2', 'dmg-bz2', [glib, libbzip2], 'dmg-bz2.c'] + [liblzfse, 'dmg-lzfse', liblzfse, 'dmg-lzfse.c'], + [libbzip2, 'dmg-bz2', [glib, libbzip2], 'dmg-bz2.c'] ] - if config_host.has_key(m[0]) + if m[0].found() module_ss =3D ss.source_set() module_ss.add(when: m[2], if_true: files(m[3])) block_modules +=3D {m[1] : module_ss} --=20 2.29.2 From nobody Tue Nov 18 05:50:15 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1608158409; cv=none; d=zohomail.com; s=zohoarc; b=BBt5CpLjLqXT6nMAEQbLEmWeyO1UP4wuRZDaDItVwke6vYbQMrQWFaIELRx3RJ2dpUaMQAtZsX2v4hTR7yuFofdIGzf/rfsie201Ly/lpmebw+xWkl0x19r05nq1IWM5IzYFB+LvYLG32BuiGKKicgrBSBLsGIUuONbd4M3ILis= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608158409; h=Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=u8na5XyV6Q3dO/cfg5nIyrTRUkt6ipTXcWtK/AtR680=; b=RqYRARJ8Z/4I8NFIH/Fahxjvsn99EHivs4SfA48ELmngYB3fqIiZNtz+KdqQRFd7EdsYiE/5e+nfsuErWIupGOjeB0qTCKFYqS2A2vRBRKWT8WDLydzDQwr8SZNnl/ikuSMIvB84I2sZeW67k2yr1X8ydji1VaCC+s9pK1xzKXM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1608158409865954.0643847356764; Wed, 16 Dec 2020 14:40:09 -0800 (PST) Received: from localhost ([::1]:34392 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpZe1-0002iI-Vo for importer@patchew.org; Wed, 16 Dec 2020 11:27:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpZXH-0002FA-5h for qemu-devel@nongnu.org; Wed, 16 Dec 2020 11:20:19 -0500 Received: from mail-ej1-x62e.google.com ([2a00:1450:4864:20::62e]:34092) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kpZXE-0006Wl-Sl for qemu-devel@nongnu.org; Wed, 16 Dec 2020 11:20:18 -0500 Received: by mail-ej1-x62e.google.com with SMTP id g20so33598917ejb.1 for ; Wed, 16 Dec 2020 08:20:16 -0800 (PST) Received: from avogadro.lan ([2001:b07:6468:f312:c8dd:75d4:99ab:290a]) by smtp.gmail.com with ESMTPSA id a13sm21264501edb.76.2020.12.16.08.20.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 08:20:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=u8na5XyV6Q3dO/cfg5nIyrTRUkt6ipTXcWtK/AtR680=; b=VnvO7UuDL2nvdSShLU5k4JSjoaFR8kopUyVVS+NgWcq99IyjLopjbMe+39M3HNUbUB TsXGAguPvk9MwKj/NGTIYTtPyElYVNhZFWQQdqbCzowL6J7r5wKeX7a5we/ESlJbBMyt 9lFACZ86lGQY76T2vVVECIpd8i5HD2eACqiCDEnqNIuirPocjj5GVO5mxb0OO7sFb0xU dy9F9/oQYpVmcDgQthzaKYYRoAPizsLj+zibw+103lqR8+Vnz/UyJc+tsuwqheZkfTBb dqOgsrp22DjxmEe0WT9p11TpkZy6aLw3B7dVgMY21/qOh7zoCpE8MZIXppSaAPrZgvp+ VSLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=u8na5XyV6Q3dO/cfg5nIyrTRUkt6ipTXcWtK/AtR680=; b=TOwotLBuFU92tHR2b0IM+ttOJesADfXUUDgr4NJQBo9z7eB7rkVSO2HwnqpFczD31u 2SpFRZZVQzEGIEtphBQ5ZuOCmpTA8luE0LchvNk+DxK/7X1T8ueRjR0Olv9I4HBw1pKF 627dEEDXqEAn7ErEOpSmPtJNlOJH/MBe05UgyLWDXR3jTipHSegIpb0vSbckNl22/YqW UTMR4pzmCkpDUUfR2ehJitN7ikjJ+n3FhywaE8zO8kEpG4dLd2api0ushDgvUxKRRZy2 DdVAP9n9Sr9K5+zmaIdsCJl8Ods+Y1fER3ttnqmfRPSCQjHaQKM5nucF+kUw2OCn0Pjl RdQg== X-Gm-Message-State: AOAM530jALDrHvk0hJ2yzTOzU8S4tCrwqkOBS6D2foXEr+PStrEIVXwD fkG1rt+BMVHWeP/nr2SfN+i+x3h1xt8= X-Google-Smtp-Source: ABdhPJxwLirO85e6iC9561YM3In4FljNT0xRq7rP/Wnf7a/Scp4NeiUNjK+ZOSYBJU0YMqyt5A+rrA== X-Received: by 2002:a17:907:700c:: with SMTP id wr12mr30857229ejb.398.1608135615135; Wed, 16 Dec 2020 08:20:15 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 7/7] meson: cleanup Kconfig.host handling Date: Wed, 16 Dec 2020 17:20:06 +0100 Message-Id: <20201216162006.433850-8-pbonzini@redhat.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201216162006.433850-1-pbonzini@redhat.com> References: <20201216162006.433850-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62e; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x62e.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Build the array of command line arguments coming from config_host once for all targets. Add all accelerators to accel/Kconfig so that the command line arguments for accelerators can be computed easily in the existing "foreach sym: accelerators" loop. Signed-off-by: Paolo Bonzini Reviewed-by: Marc-Andr=C3=A9 Lureau --- accel/Kconfig | 9 +++++++++ docs/devel/kconfig.rst | 19 +++++++++---------- meson.build | 43 +++++++++++++++++------------------------- 3 files changed, 35 insertions(+), 36 deletions(-) diff --git a/accel/Kconfig b/accel/Kconfig index 2ad94a3839..461104c771 100644 --- a/accel/Kconfig +++ b/accel/Kconfig @@ -1,3 +1,12 @@ +config WHPX + bool + +config HAX + bool + +config HVF + bool + config TCG bool =20 diff --git a/docs/devel/kconfig.rst b/docs/devel/kconfig.rst index 336ba0e8e5..cb2d7ffac0 100644 --- a/docs/devel/kconfig.rst +++ b/docs/devel/kconfig.rst @@ -288,21 +288,20 @@ they will include all these symbols and some help tex= t on what they do. ---------------- =20 In some special cases, a configurable element depends on host features -that are detected by QEMU's configure script; for example some devices -depend on the availability of KVM or on the presence of a library on -the host. +that are detected by QEMU's configure or ``meson.build`` scripts; for +example some devices depend on the availability of KVM or on the presence +of a library on the host. =20 These symbols should be listed in ``Kconfig.host`` like this:: =20 - config KVM + config TPM bool =20 -and also listed as follows in the top-level Makefile's ``MINIKCONF_ARGS`` +and also listed as follows in the top-level meson.build's host_kconfig variable:: =20 - MINIKCONF_ARGS =3D \ - $@ $*/config-devices.mak.d $< $(MINIKCONF_INPUTS) \ - CONFIG_KVM=3D$(CONFIG_KVM) \ - CONFIG_SPICE=3D$(CONFIG_SPICE) \ - CONFIG_TPM=3D$(CONFIG_TPM) \ + host_kconfig =3D \ + ('CONFIG_TPM' in config_host ? ['CONFIG_TPM=3Dy'] : []) + \ + ('CONFIG_SPICE' in config_host ? ['CONFIG_SPICE=3Dy'] : []) + \ + ('CONFIG_IVSHMEM' in config_host ? ['CONFIG_IVSHMEM=3Dy'] : []) + \ ... diff --git a/meson.build b/meson.build index 0b36fb38f1..bb198f792a 100644 --- a/meson.build +++ b/meson.build @@ -954,21 +954,19 @@ if link_language =3D=3D 'cpp' } endif =20 -kconfig_external_symbols =3D [ - 'CONFIG_KVM', - 'CONFIG_XEN', - 'CONFIG_TPM', - 'CONFIG_SPICE', - 'CONFIG_IVSHMEM', - 'CONFIG_OPENGL', - 'CONFIG_X11', - 'CONFIG_VHOST_USER', - 'CONFIG_VHOST_VDPA', - 'CONFIG_VHOST_KERNEL', - 'CONFIG_VIRTFS', - 'CONFIG_LINUX', - 'CONFIG_PVRDMA', -] +host_kconfig =3D \ + ('CONFIG_TPM' in config_host ? ['CONFIG_TPM=3Dy'] : []) + \ + ('CONFIG_SPICE' in config_host ? ['CONFIG_SPICE=3Dy'] : []) + \ + ('CONFIG_IVSHMEM' in config_host ? ['CONFIG_IVSHMEM=3Dy'] : []) + \ + ('CONFIG_OPENGL' in config_host ? ['CONFIG_OPENGL=3Dy'] : []) + \ + ('CONFIG_X11' in config_host ? ['CONFIG_X11=3Dy'] : []) + \ + ('CONFIG_VHOST_USER' in config_host ? ['CONFIG_VHOST_USER=3Dy'] : []) + \ + ('CONFIG_VHOST_VDPA' in config_host ? ['CONFIG_VHOST_VDPA=3Dy'] : []) + \ + ('CONFIG_VHOST_KERNEL' in config_host ? ['CONFIG_VHOST_KERNEL=3Dy'] : []= ) + \ + ('CONFIG_VIRTFS' in config_host ? ['CONFIG_VIRTFS=3Dy'] : []) + \ + ('CONFIG_LINUX' in config_host ? ['CONFIG_LINUX=3Dy'] : []) + \ + ('CONFIG_PVRDMA' in config_host ? ['CONFIG_PVRDMA=3Dy'] : []) + ignored =3D [ 'TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_ARCH' ] =20 default_targets =3D 'CONFIG_DEFAULT_TARGETS' in config_host @@ -1003,7 +1001,7 @@ foreach target : target_dirs } endif =20 - have_accel =3D false + accel_kconfig =3D [] foreach sym: accelerators if sym =3D=3D 'CONFIG_TCG' or target in accelerator_targets.get(sym, [= ]) config_target +=3D { sym: 'y' } @@ -1011,10 +1009,10 @@ foreach target : target_dirs if sym =3D=3D 'CONFIG_XEN' and have_xen_pci_passthrough config_target +=3D { 'CONFIG_XEN_PCI_PASSTHROUGH': 'y' } endif - have_accel =3D true + accel_kconfig +=3D [ sym + '=3Dy' ] endif endforeach - if not have_accel + if accel_kconfig.length() =3D=3D 0 if default_targets continue endif @@ -1068,13 +1066,6 @@ foreach target : target_dirs configuration: config_targe= t_data)} =20 if target.endswith('-softmmu') - base_kconfig =3D [] - foreach sym : kconfig_external_symbols - if sym in config_target or sym in config_host - base_kconfig +=3D '@0@=3Dy'.format(sym) - endif - endforeach - config_devices_mak =3D target + '-config-devices.mak' config_devices_mak =3D configure_file( input: ['default-configs/devices' / target + '.mak', 'Kconfig'], @@ -1083,7 +1074,7 @@ foreach target : target_dirs capture: true, command: [minikconf, config_host['CONFIG_MINIKCONF_MODE'], config_devices_mak, '@DEPFILE@', '@INPUT@', - base_kconfig]) + host_kconfig, accel_kconfig]) =20 config_devices_data =3D configuration_data() config_devices =3D keyval.load(config_devices_mak) --=20 2.29.2