From nobody Mon Feb 9 04:08:57 2026 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=1619861570; cv=none; d=zohomail.com; s=zohoarc; b=NbqEb+axjRHBVeAd3o36Q47lxTggWvsXjh7N61MB/lCmNY/355KfK5WR4NzSYmeGXH2qfcV4uG9njHmcB8zZd7OSKRFKF5Y3Y+NVfgVA4mfy27xQbEXVjl54shtXsv6Ya+ixw9c9GpfCkS0hFxP/ZOz9F9a5YsaBmtXvX5t3tAo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619861570; 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=pZPA3Fo5/U12JHJo/A7HGQPM2TFAL/3tsSdQo2FPQjQ=; b=B6hvalMNgjMZvKa6y3wmbA4Hd7dfAWapIEmezjflSiWPMh3OqMSWATL6sRi8B5FyaMivpNEeFjVFcI9LRyjQWxuVDqUzdvQVN6wvNy1Jsj+PGZgpHXu1RFNhHu1XMo932mSJ+7DqRn4q1sIdbV6diGha8iVSyVldf3cx5ztmqTg= 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 1619861570750328.492386738415; Sat, 1 May 2021 02:32:50 -0700 (PDT) Received: from localhost ([::1]:53648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lclzV-0002Ep-5U for importer@patchew.org; Sat, 01 May 2021 05:32:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lclxS-0000YW-2I for qemu-devel@nongnu.org; Sat, 01 May 2021 05:30:42 -0400 Received: from mail-ej1-x636.google.com ([2a00:1450:4864:20::636]:42508) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lclxQ-0005Xp-CF for qemu-devel@nongnu.org; Sat, 01 May 2021 05:30:41 -0400 Received: by mail-ej1-x636.google.com with SMTP id y7so702721ejj.9 for ; Sat, 01 May 2021 02:30:37 -0700 (PDT) Received: from avogadro.lan ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id ga33sm4632721ejc.11.2021.05.01.02.30.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 May 2021 02:30:36 -0700 (PDT) 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=pZPA3Fo5/U12JHJo/A7HGQPM2TFAL/3tsSdQo2FPQjQ=; b=ALhBFyKqGh0IMjL/qD6rSUXiQt2zme5pfQsCSNEXbK5eZq7cVhLyA8LwZ22phryPvi 01Tdu/1lgVI6vjauU8F60jdunsT4yXu0DsFT+y6c5f7G/zovWMq8IYGGVE9U8llp68k6 aEcCPKRfbDmIp7Wyzxr3EsWEN2tlKSB7iFcekbxlsHgOPzkJPHVe6XfPJSALI/KNRR1X d/QUK/mX2TjG8GhvKfDx5dLPLfXegXvSs9DW8iYSlxiJIBfJRG5XUnZIGm218k8lRO0S NrgReC/FF9RrTn24d42BgYOwnka954BEd4beLOmcRzOaGXMghTLkUScWsbcMYLwJa1Tz 5yeA== 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=pZPA3Fo5/U12JHJo/A7HGQPM2TFAL/3tsSdQo2FPQjQ=; b=AMkUBojg7pXnv/R1smt36Vhy1zeTeTNyN20HPSRE92IAzr2Zvy1y6BeRKMP+e6i9Lh K19ZcBP4sTdpuryva5AAkrCgkmE16gZD4aN6f37+PBsIW85wB8AN9h37aBax3+OvS8n9 r9fZhwuQiyOoeDCwObFmS/dXeKiforc4FHgo/Kgxnait3n2ab9BF5UjG2ZpmGrqswy4+ MltTmk99xOabqexZxPdP85tAAn6l+XIsI3Eb0+dCZDRwau46QT8CKDFE3Mw+bhnTDVG1 QlpFqz6BS06jy+nbsCagu8vVQZC4lvrxP4AFPqqDVPyBRbgmoxtaaXhrHDNLX7ew/+hh wXaw== X-Gm-Message-State: AOAM532K65u6iMeGK2v7Se4B3LOGXBKxt8HE/AHvlspIVDq+PqzhtSID ObtNzcg+0oFB1xEtZnAsThUsjWJbmC0= X-Google-Smtp-Source: ABdhPJzeZI7mGyHYXqeUsvmTm6lDuXaXOLhk8NM0l2A9CzQO75Q4WOGZW2ZkF379VqGYU0ZQtSCOtw== X-Received: by 2002:a17:906:f8cf:: with SMTP id lh15mr8236259ejb.121.1619861436623; Sat, 01 May 2021 02:30:36 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/10] configure: reindent meson invocation Date: Sat, 1 May 2021 11:30:24 +0200 Message-Id: <20210501093026.189429-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210501093026.189429-1-pbonzini@redhat.com> References: <20210501093026.189429-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.25, 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 --- configure | 76 +++++++++++++++++++++++++++---------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/configure b/configure index ccc58ccc46..0b8283c95c 100755 --- a/configure +++ b/configure @@ -6345,33 +6345,33 @@ for rom in seabios; do done =20 if test "$skip_meson" =3D no; then -cross=3D"config-meson.cross.new" -meson_quote() { + cross=3D"config-meson.cross.new" + meson_quote() { echo "'$(echo $* | sed "s/ /','/g")'" -} - -echo "# Automatically generated by configure - do not modify" > $cross -echo "[properties]" >> $cross -test -z "$cxx" && echo "link_language =3D 'c'" >> $cross -echo "[built-in options]" >> $cross -echo "c_args =3D [${CFLAGS:+$(meson_quote $CFLAGS)}]" >> $cross -echo "cpp_args =3D [${CXXFLAGS:+$(meson_quote $CXXFLAGS)}]" >> $cross -echo "c_link_args =3D [${LDFLAGS:+$(meson_quote $LDFLAGS)}]" >> $cross -echo "cpp_link_args =3D [${LDFLAGS:+$(meson_quote $LDFLAGS)}]" >> $cross -echo "[binaries]" >> $cross -echo "c =3D [$(meson_quote $cc)]" >> $cross -test -n "$cxx" && echo "cpp =3D [$(meson_quote $cxx)]" >> $cross -test -n "$objcc" && echo "objc =3D [$(meson_quote $objcc)]" >> $cross -echo "ar =3D [$(meson_quote $ar)]" >> $cross -echo "nm =3D [$(meson_quote $nm)]" >> $cross -echo "pkgconfig =3D [$(meson_quote $pkg_config_exe)]" >> $cross -echo "ranlib =3D [$(meson_quote $ranlib)]" >> $cross -if has $sdl2_config; then - echo "sdl2-config =3D [$(meson_quote $sdl2_config)]" >> $cross -fi -echo "strip =3D [$(meson_quote $strip)]" >> $cross -echo "windres =3D [$(meson_quote $windres)]" >> $cross -if test "$cross_compile" =3D "yes"; then + } + + echo "# Automatically generated by configure - do not modify" > $cross + echo "[properties]" >> $cross + test -z "$cxx" && echo "link_language =3D 'c'" >> $cross + echo "[built-in options]" >> $cross + echo "c_args =3D [${CFLAGS:+$(meson_quote $CFLAGS)}]" >> $cross + echo "cpp_args =3D [${CXXFLAGS:+$(meson_quote $CXXFLAGS)}]" >> $cross + echo "c_link_args =3D [${LDFLAGS:+$(meson_quote $LDFLAGS)}]" >> $cross + echo "cpp_link_args =3D [${LDFLAGS:+$(meson_quote $LDFLAGS)}]" >> $cross + echo "[binaries]" >> $cross + echo "c =3D [$(meson_quote $cc)]" >> $cross + test -n "$cxx" && echo "cpp =3D [$(meson_quote $cxx)]" >> $cross + test -n "$objcc" && echo "objc =3D [$(meson_quote $objcc)]" >> $cross + echo "ar =3D [$(meson_quote $ar)]" >> $cross + echo "nm =3D [$(meson_quote $nm)]" >> $cross + echo "pkgconfig =3D [$(meson_quote $pkg_config_exe)]" >> $cross + echo "ranlib =3D [$(meson_quote $ranlib)]" >> $cross + if has $sdl2_config; then + echo "sdl2-config =3D [$(meson_quote $sdl2_config)]" >> $cross + fi + echo "strip =3D [$(meson_quote $strip)]" >> $cross + echo "windres =3D [$(meson_quote $windres)]" >> $cross + if test "$cross_compile" =3D "yes"; then cross_arg=3D"--cross-file config-meson.cross" echo "[host_machine]" >> $cross if test "$mingw32" =3D "yes" ; then @@ -6403,17 +6403,17 @@ if test "$cross_compile" =3D "yes"; then else echo "endian =3D 'little'" >> $cross fi -else + else cross_arg=3D"--native-file config-meson.cross" -fi -mv $cross config-meson.cross + 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 \ + 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;= fi) + fi + NINJA=3D$ninja $meson setup \ --prefix "$prefix" \ --libdir "$libdir" \ --libexecdir "$libexecdir" \ @@ -6455,9 +6455,9 @@ NINJA=3D$ninja $meson setup \ $cross_arg \ "$PWD" "$source_path" =20 -if test "$?" -ne 0 ; then - error_exit "meson setup failed" -fi + if test "$?" -ne 0 ; then + error_exit "meson setup failed" + fi fi =20 if test -n "${deprecated_features}"; then --=20 2.31.1