From nobody Tue Feb 10 19:23:10 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=1693659740; cv=none; d=zohomail.com; s=zohoarc; b=BME1b2nrgxKvXLq5uB64tHXn7Yp3/jG6c1TuUfby4nvRYknDBReQWp07c3NjYKzQYsk7haSciA1AidffIOpx8ERj+X/YQfy+LA5uWGZ1SDDeVfEil8vRx/uqgWr5lik1mUSQwIc1QwE2UX92/fUj7OpY6bPE6YJCy9oI1Ro6g4E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693659740; 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=EdLsJG62Ze4MUY0tKyHT3F9g6F8Ou2/1hureqaW2AWw=; b=ZOV1XhtqUx3j/g8nBVKijBaYMWzAFoLgFvVysN0hnJxekiYhq4OM0LzZo2yztKzE0nWtioJcq6fLJv0A6itrqoHtHpNWBYMtyDDe/RoqkbbH8s9wg8E7YkWVaz2/1jK8pP63X8R4XsfD6zIQBUH0gKMxpSKRUWQbs32VX9eq2GY= 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 1693659740724725.6555370680825; Sat, 2 Sep 2023 06:02:20 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcQEF-00017H-J1; Sat, 02 Sep 2023 08:59:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qcQEE-00013K-1L for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qcQEB-0001hC-Q0 for qemu-devel@nongnu.org; Sat, 02 Sep 2023 08:59:53 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-652-fnDC_Bd8Nxm_8mEU4J8t8g-1; Sat, 02 Sep 2023 08:59:49 -0400 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-31c5c762f97so1647054f8f.1 for ; Sat, 02 Sep 2023 05:59:49 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id d1-20020adfa401000000b0031980294e9fsm4995496wra.116.2023.09.02.05.59.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 05:59:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693659591; 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=EdLsJG62Ze4MUY0tKyHT3F9g6F8Ou2/1hureqaW2AWw=; b=KYhGoFLe6z/0kXg2VPW2K0F9APWMezK8+pE2kbD59cUD6gvip9m5qq0XDAWmzfFmWSJT64 3qHiL34VEr4zyTSW6zM3JFC8W3/DSh5Apm2uMXeB7fDxmGgq5nhIySxiaiPZW0GJ0RZ1C9 6Chcr8cSSFNIaaO0GyPKXwXE/oXBxXE= X-MC-Unique: fnDC_Bd8Nxm_8mEU4J8t8g-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693659588; x=1694264388; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EdLsJG62Ze4MUY0tKyHT3F9g6F8Ou2/1hureqaW2AWw=; b=HoUQhkJdfKKRgs0pWm5fXnSZOuM28f7sntLwv/mGjSnkQ6JqmXiBD3jTT9Pgx0rLzw dg+IczXDiTcMXCFp3epHDSeMBgCy+NnoeQNkcPxIuG0FJbwt06o4qIqukxJcAMbDyxsb V8iASMIxtYHa14azCx+/JwNLYK7FH0PGhUWRBC4Uq2dW4r73cOwx3QgmZp4X2fhyw0ru YLzYxIK5xHuJaUTKEtcofNupeQiOVZmMxRFln4nXjYlMrKqdL9V4Le6A1rvvM9Z5DkYF vSzqBUSAZyE9YXRpagmWbldA90ccnwJnFzm2POXOnxU2cIlgGecL8rxh9oHWboDTWS0r yS6w== X-Gm-Message-State: AOJu0Yzm/5KIjSaDkvX7bNXGp8fWffS9uJbQ9Nox4fJhngXGezAW0OSb 5m5T34R8zw9xa7Pwyh3PrKE60FSkAIyEdddC4izhnrNUFKz/RmiGelv8FSiEx5tOKmzc8Ij4IEy eU1anrmWEHxqHwBoyS+YxHcnX30SE+UHQfF4Gx7ULR2nM1rR6xkdTJ8hSl+jYkiE4fO2BKPFnaq 4= X-Received: by 2002:a05:6000:10cf:b0:314:748:d59d with SMTP id b15-20020a05600010cf00b003140748d59dmr3464620wrx.27.1693659587819; Sat, 02 Sep 2023 05:59:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEpWjliVqVheTHM/U1Me/RRj2jM8hR14tLqitVIefTS/sfPdRJhpsUSsVX+5FtaXaz2LH+WZw== X-Received: by 2002:a05:6000:10cf:b0:314:748:d59d with SMTP id b15-20020a05600010cf00b003140748d59dmr3464609wrx.27.1693659587474; Sat, 02 Sep 2023 05:59:47 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 06/15] configure: remove boolean variables for targets Date: Sat, 2 Sep 2023 14:59:25 +0200 Message-ID: <20230902125934.113017-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230902125934.113017-1-pbonzini@redhat.com> References: <20230902125934.113017-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=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, 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_H4=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.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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1693659742913100003 Content-Type: text/plain; charset="utf-8" Just use $targetos always. Signed-off-by: Paolo Bonzini Reviewed-by: Richard Henderson Reviewed-by: Thomas Huth --- configure | 55 +++++++++++++------------------------------------------ 1 file changed, 13 insertions(+), 42 deletions(-) diff --git a/configure b/configure index 378a0de9fb6..f96f7359a83 100755 --- a/configure +++ b/configure @@ -374,45 +374,14 @@ fi =20 # OS specific =20 -mingw32=3D"no" -bsd=3D"no" -linux=3D"no" -solaris=3D"no" case $targetos in windows) - mingw32=3D"yes" plugins=3D"no" pie=3D"no" ;; -gnu/kfreebsd) - bsd=3D"yes" -;; -freebsd) - bsd=3D"yes" - # needed for kinfo_getvmmap(3) in libutil.h -;; -dragonfly) - bsd=3D"yes" -;; -netbsd) - bsd=3D"yes" -;; -openbsd) - bsd=3D"yes" -;; -darwin) - bsd=3D"yes" - darwin=3D"yes" -;; -sunos) - solaris=3D"yes" -;; haiku) pie=3D"no" ;; -linux) - linux=3D"yes" -;; esac =20 if test ! -z "$cpu" ; then @@ -627,7 +596,7 @@ do fi done =20 -if test "$mingw32" =3D "yes" ; then +if test "$targetos" =3D "windows" ; then EXESUF=3D".exe" prefix=3D"/qemu" bindir=3D"" @@ -809,7 +778,7 @@ for opt do ;; --enable-download) download=3D"enabled"; git_submodules_action=3Dupdate; ;; - --enable-plugins) if test "$mingw32" =3D "yes"; then + --enable-plugins) if test "$targetos" =3D "windows"; then error_exit "TCG plugins not currently supported on= Windows platforms" else plugins=3D"yes" @@ -1080,7 +1049,7 @@ fi # by default. Only enable by default for git builds if test -z "$werror" ; then if test -e "$source_path/.git" && \ - { test "$linux" =3D "yes" || test "$mingw32" =3D "yes"; }; then + { test "$targetos" =3D linux || test "$targetos" =3D "windows"; };= then werror=3D"yes" else werror=3D"no" @@ -1718,7 +1687,7 @@ echo all: >> $config_host_mak if test "$debug_tcg" =3D "yes" ; then echo "CONFIG_DEBUG_TCG=3Dy" >> $config_host_mak fi -if test "$mingw32" =3D "yes" ; then +if test "$targetos" =3D "windows"; then echo "CONFIG_WIN32=3Dy" >> $config_host_mak echo "QEMU_GA_MANUFACTURER=3D${QEMU_GA_MANUFACTURER-QEMU}" >> $config_ho= st_mak echo "QEMU_GA_DISTRO=3D${QEMU_GA_DISTRO-Linux}" >> $config_host_mak @@ -1727,24 +1696,26 @@ else echo "CONFIG_POSIX=3Dy" >> $config_host_mak fi =20 -if test "$linux" =3D "yes" ; then +if test "$targetos" =3D "linux" ; then echo "CONFIG_LINUX=3Dy" >> $config_host_mak fi =20 -if test "$darwin" =3D "yes" ; then +if test "$targetos" =3D "darwin" ; then echo "CONFIG_DARWIN=3Dy" >> $config_host_mak fi =20 -if test "$solaris" =3D "yes" ; then +if test "$targetos" =3D "sunos" ; then echo "CONFIG_SOLARIS=3Dy" >> $config_host_mak fi echo "SRC_PATH=3D$source_path" >> $config_host_mak echo "TARGET_DIRS=3D$target_list" >> $config_host_mak =20 # XXX: suppress that -if [ "$bsd" =3D "yes" ] ; then - echo "CONFIG_BSD=3Dy" >> $config_host_mak -fi +case $targetos in + gnu/kfreebsd | freebsd | dragonfly | netbsd | openbsd | darwin) + echo "CONFIG_BSD=3Dy" >> $config_host_mak + ;; +esac =20 if test "$plugins" =3D "yes" ; then echo "CONFIG_PLUGIN=3Dy" >> $config_host_mak @@ -1774,7 +1745,7 @@ echo "CC=3D$cc" >> $config_host_mak echo "EXESUF=3D$EXESUF" >> $config_host_mak =20 # use included Linux headers for KVM architectures -if test "$linux" =3D "yes" && test -n "$linux_arch"; then +if test "$targetos" =3D "linux" && test -n "$linux_arch"; then symlink "$source_path/linux-headers/asm-$linux_arch" linux-headers/asm fi =20 --=20 2.41.0