From nobody Sat May 18 14:01:29 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684521666; cv=none; d=zohomail.com; s=zohoarc; b=UH+Vv8hsbcH8nSuTNFe+FHap6CDvc2Frr3jSvZKG7tBcb5GEP2ihlF8zR15akIzoafzQq8/Hy6BPt+6L2elL34bgBEk6vDsTb7W6rQQUeFk95hu82PsnQ5gzl87GTgUBpxn4Cmoi/Fu2x0vxjLet1e6wIV6OH+dUiKqAreN2xgM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684521666; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=iYItxu7m4awRJ5FFPZ2WrqhKQ6rnduawzAHt+HM9nCE=; b=AZ/fyecky30Yp+8dVhaHPNAlnDg9Cu4rl5sVT1mVAJ5r5spi+pNFwEJzju/SH7MZC4IgEQBivvQXkSErbyY0ztTWYJjZ4hwUYTQ4P4FF1jVoe3sjdnMOXCllLuu4S2RxmT6XSabwejk6SEr/1sX/XsMI2E7PC1pYAprk+mLnSBk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1684521666009706.5316973901582; Fri, 19 May 2023 11:41:06 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q051T-0001g5-VE; Fri, 19 May 2023 14:40:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q051Q-0001fp-On for qemu-devel@nongnu.org; Fri, 19 May 2023 14:40:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q051O-0005ms-OY for qemu-devel@nongnu.org; Fri, 19 May 2023 14:40:12 -0400 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-500-A-1qaIw3OUC0kl1xhtMmAw-1; Fri, 19 May 2023 14:40:06 -0400 Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-511b509b55bso930744a12.0 for ; Fri, 19 May 2023 11:40:06 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:9af8:e5f5:7516:fa89]) by smtp.gmail.com with ESMTPSA id s19-20020a056402015300b0050bc5acfcc0sm42906edu.24.2023.05.19.11.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 May 2023 11:40:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684521609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iYItxu7m4awRJ5FFPZ2WrqhKQ6rnduawzAHt+HM9nCE=; b=TQONEA7NQFM8DAzo/hUakdzgXZWNj0TpAkjYtseyBaKKMd0wCkaIx87qiKSYlMWv3rjNa9 YeJ6r7g39U/13TGRln4e/iamVACG2eV5/+CS6NqaDAgSQM7LSgQNPqc5EmtNyIvIUy7puF Zo/xRWBZZQy70b/agJdlo+UcrGNspuI= X-MC-Unique: A-1qaIw3OUC0kl1xhtMmAw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684521605; x=1687113605; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iYItxu7m4awRJ5FFPZ2WrqhKQ6rnduawzAHt+HM9nCE=; b=WRQwXeHdS8Z5ilp0XZgVXoOWV8YAD/kIxwDNL8n3PjuX4BkfqoLhYyGoRx4VAXEj/m DqoV0kgbKNLWgB9R0K8hiaZC8uyVoi4JtkWngRW4LR3EZQr1Ihu0O0HvmFg/ZgBaz9Ow oa5DRVtE32u+36+tJRGDYS7ZKOGa0ZQh0dbrstcymzaljB9erCXra2JF2cB8ClIBxQeH ZqQ6fEtJ63nQalaunicYMPopNz4A2Ap92Oqr0zzVPo0KztnXtBHp9JTNGLyvF3P49wcr 14lgucIek4eDaV1UBw6xdPtKjLobmdIszUFOdmJ77QW5SYyQ9PxnYLEFpDXcd2Sl3zFw S1jQ== X-Gm-Message-State: AC+VfDxG65+2EjTQ+rx7g8EFe00LaKwKYzEgDjQ1yITdd03BGaw0WAwE Q3wUUxCsV3xdavqm282DTF1JcOQRIZhqS7wqpdfDNZq4BSag8njW52BEbQZrpFX+4uEhj7NUZFG KCmhfaMDVCLVouehFDqhcO6U9urQ3XtX9i65BRk5hGHklpc4CInQXNUYi3fopku9+MnWq0xY2dO g= X-Received: by 2002:a05:6402:357:b0:50d:682d:d431 with SMTP id r23-20020a056402035700b0050d682dd431mr2625149edw.16.1684521605003; Fri, 19 May 2023 11:40:05 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7diUBsmeGrtFSYhC7bwr1m5U8rQ2G0puLNH2nBA8s1DTR/PoQo3VWgh3mgCbiWqrHnmjkodQ== X-Received: by 2002:a05:6402:357:b0:50d:682d:d431 with SMTP id r23-20020a056402035700b0050d682dd431mr2625137edw.16.1684521604635; Fri, 19 May 2023 11:40:04 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Peter Maydell Subject: [PATCH] build: rebuild build.ninja using "meson setup --reconfigure" Date: Fri, 19 May 2023 20:40:03 +0200 Message-Id: <20230519184003.1185450-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.40.1 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684521666654100003 Content-Type: text/plain; charset="utf-8" Do not use the rule in build.ninja, because the path to meson is hardcoded in build.ninja and this breaks if meson moves (for example if the distro meson suddenly becomes too old after an update). Reported-by: Peter Maydell Tested-by: Peter Maydell Signed-off-by: Paolo Bonzini --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 3c7d67142f13..08fb6a3b058a 100644 --- a/Makefile +++ b/Makefile @@ -115,15 +115,15 @@ Makefile.ninja: build.ninja $(NINJA) -t query build.ninja | sed -n '1,/^ input:/d; /^ outputs:/q;= s/$$/ \\/p'; \ } > $@.tmp && mv $@.tmp $@ -include Makefile.ninja +endif =20 +ifneq ($(MESON),) # 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 + $(MESON) setup --reconfigure $(SRC_PATH) && touch $@ =20 -ifneq ($(MESON),) Makefile.mtest: build.ninja scripts/mtest2make.py $(MESON) introspect --targets --tests --benchmarks | $(PYTHON) scripts/mt= est2make.py > $@ -include Makefile.mtest --=20 2.40.1