From nobody Tue Feb 10 04:16:33 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=1639644822; cv=none; d=zohomail.com; s=zohoarc; b=mjWiTIttRAg7+4gdHAcGN5OWZe9DJETlpFk7aqkU8WypKeOXoyiSNrJfxlU2mmQTO9spaiu2SXytGS/xSG96wYLZMEJMFT9NCsdxlV/RRK6hOfixfyCfEmunyUv7GnjM2+QwRIQHBcEs0E4LvS50Dsv6xLvAPbnjbeW4qI3/0HU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1639644822; h=Content-Type: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=HYlD6TOFjvCShzjuklplaU9V9dCleRW8qoPWy0G46K4=; b=aIKlRR2mo7IMWtbO9FHFEx8FWjGbFycRsBR3oxvXA4IjgtWB4BjkqVDEu/m4Tg0LhmyjeceWOdNFEdE6sfo44c74Zq5+2O6zVjwfGSdg9o1J2Wium2uAdiyG65Q/FtR2pPo2F3nV8MZk3f5BM1X9i2EtnwdEN4iPbUvGblXZ1RQ= 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 1639644822259494.7170860528696; Thu, 16 Dec 2021 00:53:42 -0800 (PST) Received: from localhost ([::1]:56614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxmWD-0003JH-7k for importer@patchew.org; Thu, 16 Dec 2021 03:53:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUN-0000Zc-R6 for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:48 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:29984) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxmUL-000494-Rm for qemu-devel@nongnu.org; Thu, 16 Dec 2021 03:51:47 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-424-FFlEGU90PA2jUOF_vl-vHA-1; Thu, 16 Dec 2021 03:51:43 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B804B19253C5 for ; Thu, 16 Dec 2021 08:51:42 +0000 (UTC) Received: from avogadro.mxp.redhat.com (unknown [10.39.194.194]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3A2592C1AB for ; Thu, 16 Dec 2021 08:51:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1639644705; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=HYlD6TOFjvCShzjuklplaU9V9dCleRW8qoPWy0G46K4=; b=bgVRthDzoq3VRMSzKsBe+A0KhTN3uAioQidsnfnes30anh/yBYMT09k5jKh4fsONcTwzew SbLNz8uISGr8/GLP93lx+/kpr3TsnkwZctXYmw67XuKnTGq2jzg1Acft1p907Sq1Zoo7wN xHAhctYymqIsHIv5wdrLoMiV8vlNA+4= X-MC-Unique: FFlEGU90PA2jUOF_vl-vHA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 02/10] configure: make $targetos lowercase, use windows instead of MINGW32 Date: Thu, 16 Dec 2021 09:51:31 +0100 Message-Id: <20211216085139.99682-3-pbonzini@redhat.com> In-Reply-To: <20211216085139.99682-1-pbonzini@redhat.com> References: <20211216085139.99682-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.718, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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.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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1639644824016100001 Content-Type: text/plain; charset="utf-8" targetos is already mostly the same as Meson host_machine.system(), just in CamelCase. Adjust Windows, which is different, and switch to lowercase to match Meson. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson --- configure | 58 ++++++++++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/configure b/configure index ba7ab435a6..63438c1900 100755 --- a/configure +++ b/configure @@ -502,30 +502,30 @@ EOF } =20 if check_define __linux__ ; then - targetos=3D"Linux" + targetos=3Dlinux elif check_define _WIN32 ; then - targetos=3D'MINGW32' + targetos=3Dwindows elif check_define __OpenBSD__ ; then - targetos=3D'OpenBSD' + targetos=3Dopenbsd elif check_define __sun__ ; then - targetos=3D'SunOS' + targetos=3Dsunos elif check_define __HAIKU__ ; then - targetos=3D'Haiku' + targetos=3Dhaiku elif check_define __FreeBSD__ ; then - targetos=3D'FreeBSD' + targetos=3Dfreebsd elif check_define __FreeBSD_kernel__ && check_define __GLIBC__; then - targetos=3D'GNU/kFreeBSD' + targetos=3Dgnu/kfreebsd elif check_define __DragonFly__ ; then - targetos=3D'DragonFly' + targetos=3Ddragonfly elif check_define __NetBSD__; then - targetos=3D'NetBSD' + targetos=3Dnetbsd elif check_define __APPLE__; then - targetos=3D'Darwin' + targetos=3Ddarwin else # This is a fatal error, but don't report it yet, because we # might be going to just print the --help text, or it might # be the result of a missing compiler. - targetos=3D'bogus' + targetos=3Dbogus fi =20 # Some host OSes need non-standard checks for which CPU to use. @@ -533,7 +533,7 @@ fi # cross-compiling to one of these OSes then you'll need to specify # the correct CPU with the --cpu option. case $targetos in -SunOS) +sunos) # $(uname -m) returns i86pc even on an x86_64 box, so default based on i= sainfo if test -z "$cpu" && test "$(isainfo -k)" =3D "amd64"; then cpu=3D"x86_64" @@ -624,40 +624,40 @@ fi # OS specific =20 case $targetos in -MINGW32*) +windows) mingw32=3D"yes" plugins=3D"no" pie=3D"no" ;; -GNU/kFreeBSD) +gnu/kfreebsd) bsd=3D"yes" ;; -FreeBSD) +freebsd) bsd=3D"yes" bsd_user=3D"yes" make=3D"${MAKE-gmake}" # needed for kinfo_getvmmap(3) in libutil.h ;; -DragonFly) +dragonfly) bsd=3D"yes" make=3D"${MAKE-gmake}" ;; -NetBSD) +netbsd) bsd=3D"yes" make=3D"${MAKE-gmake}" ;; -OpenBSD) +openbsd) bsd=3D"yes" make=3D"${MAKE-gmake}" ;; -Darwin) +darwin) bsd=3D"yes" darwin=3D"yes" # Disable attempts to use ObjectiveC features in os/object.h since they # won't work when we're compiling with gcc as a C compiler. QEMU_CFLAGS=3D"-DOS_OBJECT_USE_OBJC=3D0 $QEMU_CFLAGS" ;; -SunOS) +sunos) solaris=3D"yes" make=3D"${MAKE-gmake}" smbd=3D"${SMBD-/usr/sfw/sbin/smbd}" @@ -666,11 +666,11 @@ SunOS) # needed for TIOCWIN* defines in termios.h QEMU_CFLAGS=3D"-D__EXTENSIONS__ $QEMU_CFLAGS" ;; -Haiku) +haiku) pie=3D"no" QEMU_CFLAGS=3D"-DB_USE_POSITIVE_POSIX_ERRORS -D_BSD_SOURCE -fPIC $QEMU_C= FLAGS" ;; -Linux) +linux) linux=3D"yes" linux_user=3D"yes" vhost_user=3D${default_feature:-yes} @@ -3355,8 +3355,8 @@ QEMU_GA_MSI_MINGW_DLL_PATH=3D"$($pkg_config --variabl= e=3Dprefix glib-2.0)/bin" # Mac OS X ships with a broken assembler roms=3D if { test "$cpu" =3D "i386" || test "$cpu" =3D "x86_64"; } && \ - test "$targetos" !=3D "Darwin" && test "$targetos" !=3D "SunOS" &&= \ - test "$targetos" !=3D "Haiku" && test "$softmmu" =3D yes ; then + test "$targetos" !=3D "darwin" && test "$targetos" !=3D "sunos" &&= \ + test "$targetos" !=3D "haiku" && test "$softmmu" =3D yes ; then # Different host OS linkers have different ideas about the name of the= ELF # emulation. Linux and OpenBSD/amd64 use 'elf_i386'; FreeBSD uses the = _fbsd # variant; OpenBSD/i386 uses the _obsd variant; and Windows uses i386p= e. @@ -3914,15 +3914,7 @@ if test "$skip_meson" =3D no; then 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 - echo "system =3D 'windows'" >> $cross - fi - if test "$linux" =3D "yes" ; then - echo "system =3D 'linux'" >> $cross - fi - if test "$darwin" =3D "yes" ; then - echo "system =3D 'darwin'" >> $cross - fi + echo "system =3D '$targetos'" >> $cross case "$ARCH" in i386) echo "cpu_family =3D 'x86'" >> $cross --=20 2.33.1