From nobody Sun May 19 02:06:33 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=1598468627; cv=none; d=zohomail.com; s=zohoarc; b=SKw+d90nkAvU7KGmCgipx1tMScddVVCA3+gvev3d+G90ikBACRs2gF1rpIwouCXEjSbJrY1GTCZJXiNp9sPFas/UWgLpR+XB30kj4VRHDNDdXx2kBSImdp9yepCu/wyoUtbYmjxl8fhMOZS+pPHTOtHrozn1wigm6roy0CMgBnU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598468627; 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=QAL+xb8Z8Q1fT1MGAGd3DM6glV+qy904a5V+tZdfuAs=; b=agh6063c8Lpqi9qLgaOwcO31vlT3k+IEJnAHfKa/YOGtLAe9/2p4RrBCrI/6utQC2afe0ocgt/Ym6J9209jrLnACAXfJ+bpg4UfyOZ4lc5pjmIbGqKQ0EFjdLaEyCmc83exIQ/RLisvQgC4wU1wLSd84T3mPff+yAFpgOyTdUkY= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1598468627307686.728268332788; Wed, 26 Aug 2020 12:03:47 -0700 (PDT) Received: from localhost ([::1]:39328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kB0i2-0004jO-2u for importer@patchew.org; Wed, 26 Aug 2020 15:03:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35516) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kB0hC-00047P-0k for qemu-devel@nongnu.org; Wed, 26 Aug 2020 15:02:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29089) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kB0hA-0003b8-5y for qemu-devel@nongnu.org; Wed, 26 Aug 2020 15:02:53 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-94-MJRbWALYMSittNQsGcXk7A-1; Wed, 26 Aug 2020 15:02:46 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9BFF48015AA; Wed, 26 Aug 2020 19:02:45 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B65B5C1C2; Wed, 26 Aug 2020 19:02:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598468570; 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=QAL+xb8Z8Q1fT1MGAGd3DM6glV+qy904a5V+tZdfuAs=; b=LSdMPERF9GKTU+pHlO8vhVM0NpLvuVa/T8M4JBrUtbb8hZWVqEjUqpON7NcV8q+iV1BVcS ZOtXLJn3ZSpuqd5acoAbUoAh320FzQbJqVtpCVzSjrvsHXqilaPbOwmwIW82gHNP6SgrXY IGBhgLVZBBCrReyfaVqw1t1jEG8C02A= X-MC-Unique: MJRbWALYMSittNQsGcXk7A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH v2] configure: add --ninja option Date: Wed, 26 Aug 2020 15:02:45 -0400 Message-Id: <20200826190245.22810-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/26 14:05:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, 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: Mark Cave-Ayland Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" On Windows it is not possible to invoke a Python script as $NINJA. If ninja is present use it directly, while if it is not we can keep using ninjatool. Reported-by: Mark Cave-Ayland Signed-off-by: Paolo Bonzini --- configure | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 9db9bb89b9..6ecaff429b 100755 --- a/configure +++ b/configure @@ -568,6 +568,7 @@ rng_none=3D"no" secret_keyring=3D"" libdaxctl=3D"" meson=3D"" +ninja=3D"" skip_meson=3Dno gettext=3D"" =20 @@ -1052,6 +1053,8 @@ for opt do ;; --meson=3D*) meson=3D"$optarg" ;; + --ninja=3D*) ninja=3D"$optarg" + ;; --smbd=3D*) smbd=3D"$optarg" ;; --extra-cflags=3D*) @@ -1820,6 +1823,7 @@ Advanced options (experts only): --python=3DPYTHON use specified python [$python] --sphinx-build=3DSPHINX use specified sphinx-build [$sphinx_build] --meson=3DMESON use specified meson [$meson] + --ninja=3DNINJA use specified ninja [$ninja] --smbd=3DSMBD use specified smbd [$smbd] --with-git=3DGIT use specified git [$git] --static enable static build [$static] @@ -2058,6 +2062,16 @@ case "$meson" in *) meson=3D$(command -v meson) ;; esac =20 +# Probe for ninja (used for compdb) + +if test -z "$ninja"; then + for c in ninja ninja-build samu; do + if has $c; then + ninja=3D$(command -v "$c") + break + fi + done +fi =20 # Check that the C compiler works. Doing this here before testing # the host CPU ensures that we had a valid CC to autodetect the @@ -8197,7 +8211,7 @@ fi mv $cross config-meson.cross =20 rm -rf meson-private meson-info meson-logs -NINJA=3D$PWD/ninjatool $meson setup \ +NINJA=3D${ninja:-$PWD/ninjatool} $meson setup \ --prefix "${pre_prefix}$prefix" \ --libdir "${pre_prefix}$libdir" \ --libexecdir "${pre_prefix}$libexecdir" \ --=20 2.26.2