From nobody Tue Feb 10 01:35:14 2026 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=1597762538; cv=none; d=zohomail.com; s=zohoarc; b=MjMEQG8QxguA8i1m5AfGhNxOKEQ5as1DcLLi7TJ/rr6zZd+illh9gxAaaH3ikKjAYADJzJFKs3NiG2HiqmVmNtLKxVqMzASiKkPCnEU68Vx4GUpTWHQ9LNv/K01Xgpq6IgnTwt1gKqphB0JMZKsspvdr3qDJRFNSLWlu2iRHSBA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597762538; h=Content-Type:Content-Transfer-Encoding:Cc: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=50pkwttkZyUuLZHNORozlROz/xbMXEC9xSR+bNTb4rI=; b=BCpeOkVJb8LVXpRJdfrxHGlfz/D5bk6UaqkKutF2dT9+IUDlCidbRWQpJUWQibSkxAo90NL6gbaP+WjBWTT8rgGKfJa+pUyGW6FClKOYxM5UPY31TcPjFkWZVYWaKnHlLB4v/YeEHo3rfhnWheFIjLz9QP53o5HO2b3DOjnkdwg= 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 1597762538252927.2043687237593; Tue, 18 Aug 2020 07:55:38 -0700 (PDT) Received: from localhost ([::1]:36138 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k82Rw-0000BY-6x for importer@patchew.org; Tue, 18 Aug 2020 10:18:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60224) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k82KA-0003CA-Lh for qemu-devel@nongnu.org; Tue, 18 Aug 2020 10:10:50 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:20011 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k82K7-0007KB-2D for qemu-devel@nongnu.org; Tue, 18 Aug 2020 10:10:50 -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-10-CWyJSaTDM2ihj62RTNxWaw-1; Tue, 18 Aug 2020 10:10:43 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 57AA6801AED for ; Tue, 18 Aug 2020 14:10:42 +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 15923BA63; Tue, 18 Aug 2020 14:10:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597759846; 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: in-reply-to:in-reply-to:references:references; bh=50pkwttkZyUuLZHNORozlROz/xbMXEC9xSR+bNTb4rI=; b=fJEJXI+wR2UbrXz/HYDcf00SpohvoSkHvY2kEgZp9qgztqMVz4rW6PW6cUFpNrIF1WXrsn 2bNbO9xFGlgOYuNSbJg875EFLAtjvXvgrT2JCpWpN50VuZLX8tUlFJ8AZRc6UCmOSK0Zrs CCftk5Pcso/XOQtOhABE8sa6oFwDugY= X-MC-Unique: CWyJSaTDM2ihj62RTNxWaw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 017/150] configure: generate Meson cross file Date: Tue, 18 Aug 2020 10:08:12 -0400 Message-Id: <20200818141025.21608-18-pbonzini@redhat.com> In-Reply-To: <20200818141025.21608-1-pbonzini@redhat.com> References: <20200818141025.21608-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/18 03:19:25 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=-1, 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_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 70 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 61 insertions(+), 9 deletions(-) diff --git a/configure b/configure index e0a2d262ea..22b89a5e24 100755 --- a/configure +++ b/configure @@ -8580,24 +8580,76 @@ echo "# Automatically generated by configure - do n= ot modify" > "$iotests_common echo >> "$iotests_common_env" echo "export PYTHON=3D'$python'" >> "$iotests_common_env" =20 +cross=3D"config-meson.cross.new" +echo "# Automatically generated by configure - do not modify" > $cross +echo "[binaries]" >> $cross +echo "c =3D '$cc'" >> $cross +echo "cpp =3D '$cxx'" >> $cross +echo "ar =3D '$ar'" >> $cross +echo "nm =3D '$nm'" >> $cross +echo "pkgconfig =3D '$pkg_config_exe'" >> $cross +echo "ranlib =3D '$ranlib'" >> $cross +echo "strip =3D '$strip'" >> $cross +echo "windres =3D '$windres'" >> $cross +if test -n "$cross_prefix"; then + cross_arg=3D"--cross-file config-meson.cross" + # Hack: Meson expects an absolute path for the *build* machine + # for the prefix, so add a slash in front of a Windows path that + # includes a drive letter. + # + # See https://github.com/mesonbuild/meson/issues/7577. + echo "[host_machine]" >> $cross + if test "$mingw32" =3D "yes" ; then + echo "system =3D 'windows'" >> $cross + case $prefix in + ?:*) pre_prefix=3D/ ;; + esac + fi + case "$ARCH" in + i386|x86_64) + echo "cpu_family =3D 'x86'" >> $cross + ;; + ppc64le) + echo "cpu_family =3D 'ppc64'" >> $cross + ;; + *) + echo "cpu_family =3D '$ARCH'" >> $cross + ;; + esac + echo "cpu =3D '$cpu'" >> $cross + if test "$bigendian" =3D "yes" ; then + echo "endian =3D 'big'" >> $cross + else + echo "endian =3D 'little'" >> $cross + fi +else + cross_arg=3D"--native-file config-meson.cross" +fi + +if test -f config-meson.cross && ! cmp $cross config-meson.cross >/dev/nul= l 2>&1; then + rm -rf meson-private meson-info meson-logs +fi +mv $cross config-meson.cross + if test -d meson-private && ! test -f meson-private/coredata.dat; then rm -rf meson-private meson-info meson-logs fi NINJA=3D$PWD/ninjatool $meson setup \ $(if test -d meson-private/; then echo --reconfigure; fi) \ - --prefix "$prefix" \ - --libdir "$libdir" \ - --libexecdir "$libexecdir" \ - --bindir "$bindir" \ - --includedir "$includedir" \ - --datadir "$datadir" \ - --mandir "$mandir" \ - --sysconfdir "$sysconfdir" \ - --localstatedir "$local_statedir" \ + --prefix "${pre_prefix}$prefix" \ + --libdir "${pre_prefix}$libdir" \ + --libexecdir "${pre_prefix}$libexecdir" \ + --bindir "${pre_prefix}$bindir" \ + --includedir "${pre_prefix}$includedir" \ + --datadir "${pre_prefix}$datadir" \ + --mandir "${pre_prefix}$mandir" \ + --sysconfdir "${pre_prefix}$sysconfdir" \ + --localstatedir "${pre_prefix}$local_statedir" \ -Doptimization=3D$(if test "$debug" =3D yes; then echo 0; else ech= o 2; fi) \ -Ddebug=3D$(if test "$debug_info" =3D yes; then echo true; else ec= ho false; fi) \ -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) \ + $cross_arg \ "$PWD" "$source_path" =20 if test "$?" -ne 0 ; then --=20 2.26.2