From nobody Tue Feb 10 00:59:35 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1639923577212796.8400949775703; Sun, 19 Dec 2021 06:19:37 -0800 (PST) Received: from localhost ([::1]:40508 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1myx2F-0000Me-Vj for importer@patchew.org; Sun, 19 Dec 2021 09:19:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1myx02-00063w-UJ for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:18 -0500 Received: from [2a00:1450:4864:20::534] (port=42674 helo=mail-ed1-x534.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1myx01-0005wb-3S for qemu-devel@nongnu.org; Sun, 19 Dec 2021 09:17:18 -0500 Received: by mail-ed1-x534.google.com with SMTP id j21so23398479edt.9 for ; Sun, 19 Dec 2021 06:17:16 -0800 (PST) Received: from avogadro.redhat.com ([2001:b07:6468:f312:48f9:bea:a04c:3dfe]) by smtp.gmail.com with ESMTPSA id hq9sm4570665ejc.119.2021.12.19.06.17.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Dec 2021 06:17:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EqOLSg8zg8I8UXoyrrO7ni1K5iZyGc8eZFN159xRpqY=; b=cuOxYg4/wWP/1CYN3KB1EADAqmbifPXlirCkuWocq46C3PPUzBUECsHY0v0+PzusqE V2lIU8k8bYh7uT+iIWgSppIweurRExqMpV/LlxpeYxumC4H9rcqZ2GeijjngmWUDDnyE L3sRS/O+TaqbHGG1GoAONUTIoEQZE5XAjXwKD985fTdOGBuMzG14WBsBLW4x74oZHGBg x5pkflKvI9ocmna0qU1z8yBIAmRDAdd8J5BnULEtwKrpKCfqbvyCiU6pckEVZvXpEfCT Vmj6l2F/qXwkk7mlp2UIIElmgjhjFLhMhV3JjYUx7MddLSrZSy654BdXsx+9sENtxho6 /eHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=EqOLSg8zg8I8UXoyrrO7ni1K5iZyGc8eZFN159xRpqY=; b=taUXFh+e6Toy3R3xv6iN9ZGan+OJA/IcNusjPIIDWQQaiBsY7Hc0BxcIdjfoDfK4bj vucv/Lm1HhvOX1vZzLZx+lRBsv27W7cvjLuz0kNb0E9JqqgkmHqjbdCSeZOW63G4ha98 xlXXJsMDnuqVwc3qaRv7bJsU79sUl+qn9T5R2wOXLST4HiUY1njjL85SBnGEKRNUVHyy svLJm5nki4joge6V/j78wClcfayaBdgAcMBWrMwykjUAL4BHagirOaLckf0lOqVrL2Vs z4217UPbHJti90d5npxbDwUVzUzGl9uRVITFMou2czvnaUXFfLd1RDwuvj5sQGTVHPpu z62g== X-Gm-Message-State: AOAM5335GbQNLJdlfWwCbp/tTYAr/UxW62n3soW7mVPYwB9WWbqaHWlD ZwvYCKOMGPqDYgAqzthp3xh4SZJFWEw= X-Google-Smtp-Source: ABdhPJxcqswJKs9QfPePmBhG1XhLd7enqCh/ytFSkQRwHomsrzMAFEMtICQ9YlG2Zlqeq2bZcDP3BQ== X-Received: by 2002:a17:907:7b9b:: with SMTP id ne27mr9571869ejc.79.1639923434649; Sun, 19 Dec 2021 06:17:14 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 01/16] configure: make $targetos lowercase, use windows instead of MINGW32 Date: Sun, 19 Dec 2021 15:16:56 +0100 Message-Id: <20211219141711.248066-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211219141711.248066-1-pbonzini@redhat.com> References: <20211219141711.248066-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::534 (failed) 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::534; envelope-from=paolo.bonzini@gmail.com; helo=mail-ed1-x534.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 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, RDNS_NONE=0.793, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1639923578448100003 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. Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- configure | 58 ++++++++++++++++++++++++------------------------------- 1 file changed, 25 insertions(+), 33 deletions(-) diff --git a/configure b/configure index 28e1cf6291..e72e34b684 100755 --- a/configure +++ b/configure @@ -501,30 +501,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. @@ -532,7 +532,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" @@ -623,40 +623,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}" @@ -665,11 +665,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} @@ -3334,8 +3334,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. @@ -3903,15 +3903,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