From nobody Wed Nov 27 19:53:01 2024 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=1697617852; cv=none; d=zohomail.com; s=zohoarc; b=CUnZNuH79z08OMi8KcQfXLqRB8S7Q83EGSm4XSqYNG2GcRJgXqfv0sl6NJbUPvu6lhb69jbNfa2y6qtVVPiPpzeORP5VViunZ1iMXg65dPSwTZsm4IQ0PqUGP8DK+RO+4+S+jvH8atQ40Gpa7rX0RgXpY/vyri8ccbNLnJtTZcU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697617852; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=CLjhPjGdV9P1B3Px9THOBvhOzGu2EdgUFKT1l6imsao=; b=B/kFYbfAYZq8zcIV7/FK31HxDvx8yhoOQZFagXSLC2J9G8UffaetrLrYkwtZLb0qmaX8B13rkqIajF7lOruUKLOiSHUxSuBz1m0dHkcEvDCEGkFz98V1PuaVOSg/GpuZevZ/SIpkIkuEyIzLZQgbr/SK0D1Fyp4GE181Ds29BeE= 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 1697617852175882.172333882733; Wed, 18 Oct 2023 01:30:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qt1wB-00046Q-29; Wed, 18 Oct 2023 04:29: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 1qt1vV-0002mB-JA for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:29:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qt1vO-0003jc-FZ for qemu-devel@nongnu.org; Wed, 18 Oct 2023 04:29:11 -0400 Received: from mail-ej1-f69.google.com (mail-ej1-f69.google.com [209.85.218.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-41-H-cscebAPjSm7Zd13AhaFA-1; Wed, 18 Oct 2023 04:28:44 -0400 Received: by mail-ej1-f69.google.com with SMTP id a640c23a62f3a-9b65c46bca8so192462366b.1 for ; Wed, 18 Oct 2023 01:28:44 -0700 (PDT) Received: from [192.168.10.118] ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id cf14-20020a0564020b8e00b0053e0395059csm2374872edb.21.2023.10.18.01.28.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 01:28:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697617745; 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=CLjhPjGdV9P1B3Px9THOBvhOzGu2EdgUFKT1l6imsao=; b=HptOqUraNsBt5NPOlDe0A5FJo3Y1Zjkl4ldXHdtfS0JMbMBmq6KDVHE0US5rQBk9SAasqy f+SYcUqFLiJiTrntMoHpFN1DQmXwFfbMCBxPg4DsTgnQ+x2UDZ5gcyVE41wtYh+nR9+CU1 i+pBQrhYGv6eSEQQrYvYb3MxDj4qqHU= X-MC-Unique: H-cscebAPjSm7Zd13AhaFA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697617722; x=1698222522; 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=CLjhPjGdV9P1B3Px9THOBvhOzGu2EdgUFKT1l6imsao=; b=XF/627KKm20H3wAOFe15h8Oe3rsuw/pJzSiszaRU93HTaezDWh5uiopCsO4Y7VMFii Ir3ZtyF4lrdTFImzKyVUmE1evRqN804kzh9hC36MD01TI1XW6sFdO2Arc8q7wZXj8hOX iahv9usPU2oTQbqp5GmXm5ngAGsN/dmi725pEa/0hoKN+rmJQoGZcqk5/H7BKbJH8etJ SMs1GE1gIMFimHzjAurUgEGUvxHmKKp/JWLp+A1u2OiuKNhj8JNl1/kECQNlXu4elKfd kfPGNcIZ07SiFEv4+GweAnNIGLaHFerjgkDSwsvyRkSfefNI20itRbuJACtkA9O+0DtU T6gA== X-Gm-Message-State: AOJu0YyVsLHFGT3M+0KmfULpjcaugb+UZAME7fRlT/M5DvwaPVqVxdKp YD88UcXBZywfOWYUAsq0G78LaZ0kbzvuPqWQhz8wUsAgNg3KNhbaMHBYdBAFGN0Ko0627XmJhc3 eWhxyqjiN7iCH8s4xT3vXgUjGU/ohSdqApAM6S6C12OG2jSe8mZZP5uqLOXlCBkgb+LB4QvArg+ Q= X-Received: by 2002:a50:d089:0:b0:53e:78ed:924d with SMTP id v9-20020a50d089000000b0053e78ed924dmr3269023edd.5.1697617722242; Wed, 18 Oct 2023 01:28:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPloHHYZwPPJVwJddu13Hk8N3sRPc7XoS+GYFHln7cn2yBDCHULnclwC5PuVZUrYr/uDE0DA== X-Received: by 2002:a50:d089:0:b0:53e:78ed:924d with SMTP id v9-20020a50d089000000b0053e78ed924dmr3269013edd.5.1697617721778; Wed, 18 Oct 2023 01:28:41 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 26/32] configure: move target-specific defaults to an external machine file Date: Wed, 18 Oct 2023 10:27:46 +0200 Message-ID: <20231018082752.322306-27-pbonzini@redhat.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231018082752.322306-1-pbonzini@redhat.com> References: <20231018082752.322306-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.129.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: 1697617853223100011 Content-Type: text/plain; charset="utf-8" Enable Windows-specific defaults with a machine file, so that related options can be automatically parsed and included in the help message. Signed-off-by: Paolo Bonzini --- configs/meson/windows.txt | 9 +++++++++ configure | 37 ++++++++++++++--------------------- scripts/meson-buildoptions.py | 4 +++- scripts/meson-buildoptions.sh | 7 +++++++ 4 files changed, 34 insertions(+), 23 deletions(-) create mode 100644 configs/meson/windows.txt diff --git a/configs/meson/windows.txt b/configs/meson/windows.txt new file mode 100644 index 00000000000..55b192e71b1 --- /dev/null +++ b/configs/meson/windows.txt @@ -0,0 +1,9 @@ +# target-specific defaults, can still be overridden on +# the command line + +[built-in options] +bindir =3D '' +prefix =3D '/qemu' + +[project options] +qemu_suffix =3D '' diff --git a/configure b/configure index 0994f54530c..8f23c8d1655 100755 --- a/configure +++ b/configure @@ -246,8 +246,6 @@ default_cflags=3D'-O2 -g' git_submodules_action=3D"update" docs=3D"auto" EXESUF=3D"" -prefix=3D"/usr/local" -qemu_suffix=3D"qemu" system=3D"yes" linux_user=3D"" bsd_user=3D"" @@ -256,7 +254,6 @@ subdirs=3D"" ninja=3D"" python=3D download=3D"enabled" -bindir=3D"bin" skip_meson=3Dno use_containers=3D"yes" gdb_bin=3D$(command -v "gdb-multiarch" || command -v "gdb") @@ -583,9 +580,6 @@ done =20 if test "$targetos" =3D "windows" ; then EXESUF=3D".exe" - prefix=3D"/qemu" - bindir=3D"" - qemu_suffix=3D"" fi =20 meson_option_build_array() { @@ -622,6 +616,14 @@ meson_option_parse() { fi } =20 +meson_add_machine_file() { + if test "$cross_compile" =3D "yes"; then + meson_option_add --cross-file "$1" + else + meson_option_add --native-file "$1" + fi +} + for opt do optarg=3D$(expr "x$opt" : 'x[^=3D]*=3D\(.*\)') case "$opt" in @@ -629,8 +631,6 @@ for opt do ;; --version|-V) exec cat "$source_path/VERSION" ;; - --prefix=3D*) prefix=3D"$optarg" - ;; --cross-prefix=3D*) ;; --cc=3D*) @@ -701,10 +701,6 @@ for opt do ;; --static) static=3D"yes" ;; - --bindir=3D*) bindir=3D"$optarg" - ;; - --with-suffix=3D*) qemu_suffix=3D"$optarg" - ;; --host=3D*|--build=3D*|\ --disable-dependency-tracking|\ --sbindir=3D*|--sharedstatedir=3D*|\ @@ -861,7 +857,6 @@ Options: [defaults in brackets after descriptions] =20 Standard options: --help print this message - --prefix=3DPREFIX install in PREFIX [$prefix] --target-list=3DLIST set target list (default: build all) $(echo Available targets: $default_target_list | \ fold -s -w 53 | sed -e 's/^/ /') @@ -886,8 +881,6 @@ Advanced options (experts only): --ninja=3DNINJA use specified ninja [$ninja] --smbd=3DSMBD use specified smbd [$smbd] --static enable static build [$static] - --bindir=3DPATH install binaries in PATH - --with-suffix=3DSUFFIX suffix for QEMU data inside datadir/libdir/sy= sconfdir/docdir [$qemu_suffix] --without-default-features default all --enable-* options to "disabled" --without-default-devices do not include any device that is not needed = to start the emulator (only use if you are includi= ng @@ -1803,24 +1796,25 @@ if test "$skip_meson" =3D no; then else echo "endian =3D 'little'" >> $cross fi - cross_arg=3D"--cross-file config-meson.cross" =20 native=3D"config-meson.native.new" echo "# Automatically generated by configure - do not modify" > $native echo "[binaries]" >> $native echo "c =3D [$(meson_quote $host_cc)]" >> $native mv $native config-meson.native - cross_arg=3D"$cross_arg --native-file config-meson.native" - else - cross_arg=3D"--native-file config-meson.cross" + meson_option_add --native-file + meson_option_add config-meson.native fi mv $cross config-meson.cross + meson_add_machine_file config-meson.cross + if test -f "$source_path/configs/meson/$targetos.txt"; then + meson_add_machine_file $source_path/configs/meson/$targetos.txt + fi =20 rm -rf meson-private meson-info meson-logs =20 # Built-in options test "$download" =3D "disabled" && meson_option_add "--wrap-mode=3Dnodow= nload" - test "$bindir" !=3D "bin" && meson_option_add "-Dbindir=3D$bindir" test "$default_feature" =3D no && meson_option_add -Dauto_features=3Ddis= abled test "$static" =3D yes && meson_option_add -Dprefer_static=3Dtrue test "$pie" =3D no && meson_option_add -Db_pie=3Dfalse @@ -1831,11 +1825,10 @@ if test "$skip_meson" =3D no; then test "$docs" !=3D auto && meson_option_add "-Ddocs=3D$docs" test -n "${LIB_FUZZING_ENGINE+xxx}" && meson_option_add "-Dfuzzing_engin= e=3D$LIB_FUZZING_ENGINE" test "$plugins" =3D yes && meson_option_add "-Dplugins=3Dtrue" - test "$qemu_suffix" !=3D qemu && meson_option_add "-Dqemu_suffix=3D$qemu= _suffix" test "$smbd" !=3D '' && meson_option_add "-Dsmbd=3D$smbd" test "$tcg" !=3D enabled && meson_option_add "-Dtcg=3D$tcg" run_meson() { - NINJA=3D$ninja $meson setup --prefix "$prefix" "$@" $cross_arg "$PWD" = "$source_path" + NINJA=3D$ninja $meson setup "$@" "$PWD" "$source_path" } eval run_meson $meson_options if test "$?" -ne 0 ; then diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py index b787c84e914..0c24bdc1e8c 100644 --- a/scripts/meson-buildoptions.py +++ b/scripts/meson-buildoptions.py @@ -28,7 +28,6 @@ SKIP_OPTIONS =3D { "default_devices", "fuzzing_engine", - "qemu_suffix", "smbd", } =20 @@ -40,6 +39,7 @@ "malloc": "enable-malloc", "pkgversion": "with-pkgversion", "qemu_firmwarepath": "firmwarepath", + "qemu_suffix": "with-suffix", "trace_backends": "enable-trace-backends", "trace_file": "with-trace-file", } @@ -52,6 +52,7 @@ BUILTIN_OPTIONS =3D { "b_coverage", "b_lto", + "bindir", "datadir", "debug", "includedir", @@ -60,6 +61,7 @@ "localedir", "localstatedir", "mandir", + "prefix", "strip", "sysconfdir", } diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 22d69966606..e1522030619 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -3,6 +3,7 @@ meson_options_help() { printf "%s\n" ' --audio-drv-list=3DCHOICES Set audio driver list [defau= lt] (choices: alsa/co' printf "%s\n" ' reaudio/default/dsound/jack/os= s/pa/pipewire/sdl/s' printf "%s\n" ' ndio)' + printf "%s\n" ' --bindir=3DVALUE Executable directory [bin]' printf "%s\n" ' --block-drv-ro-whitelist=3DVALUE' printf "%s\n" ' set block driver read-only whi= telist (by default' printf "%s\n" ' affects only QEMU, not tools l= ike qemu-img)' @@ -62,6 +63,7 @@ meson_options_help() { printf "%s\n" ' --localedir=3DVALUE Locale data directory [share= /locale]' printf "%s\n" ' --localstatedir=3DVALUE Localstate data directory [/= var/local]' printf "%s\n" ' --mandir=3DVALUE Manual page directory [share= /man]' + printf "%s\n" ' --prefix=3DVALUE Installation prefix [/usr/lo= cal]' printf "%s\n" ' --sysconfdir=3DVALUE Sysconf data directory [etc]' printf "%s\n" ' --tls-priority=3DVALUE Default TLS protocol/cipher = priority string' printf "%s\n" ' [NORMAL]' @@ -69,6 +71,8 @@ meson_options_help() { printf "%s\n" ' auto/sigaltstack/ucontext/wind= ows)' printf "%s\n" ' --with-pkgversion=3DVALUE use specified string as sub-= version of the' printf "%s\n" ' package' + printf "%s\n" ' --with-suffix=3DVALUE Suffix for QEMU data/modules= /config directories' + printf "%s\n" ' (can be empty) [qemu]' printf "%s\n" ' --with-trace-file=3DVALUE Trace file prefix for simple= backend [trace]' printf "%s\n" '' printf "%s\n" 'Optional features, enabled with --enable-FEATURE and' @@ -229,6 +233,7 @@ _meson_option_parse() { --disable-gcov) printf "%s" -Db_coverage=3Dfalse ;; --enable-lto) printf "%s" -Db_lto=3Dtrue ;; --disable-lto) printf "%s" -Db_lto=3Dfalse ;; + --bindir=3D*) quote_sh "-Dbindir=3D$2" ;; --enable-blkio) printf "%s" -Dblkio=3Denabled ;; --disable-blkio) printf "%s" -Dblkio=3Ddisabled ;; --block-drv-ro-whitelist=3D*) quote_sh "-Dblock_drv_ro_whitelist=3D$2"= ;; @@ -407,6 +412,7 @@ _meson_option_parse() { --disable-plugins) printf "%s" -Dplugins=3Dfalse ;; --enable-png) printf "%s" -Dpng=3Denabled ;; --disable-png) printf "%s" -Dpng=3Ddisabled ;; + --prefix=3D*) quote_sh "-Dprefix=3D$2" ;; --enable-pvrdma) printf "%s" -Dpvrdma=3Denabled ;; --disable-pvrdma) printf "%s" -Dpvrdma=3Ddisabled ;; --enable-qcow1) printf "%s" -Dqcow1=3Denabled ;; @@ -414,6 +420,7 @@ _meson_option_parse() { --enable-qed) printf "%s" -Dqed=3Denabled ;; --disable-qed) printf "%s" -Dqed=3Ddisabled ;; --firmwarepath=3D*) quote_sh "-Dqemu_firmwarepath=3D$(meson_option_bui= ld_array $2)" ;; + --with-suffix=3D*) quote_sh "-Dqemu_suffix=3D$2" ;; --enable-qga-vss) printf "%s" -Dqga_vss=3Denabled ;; --disable-qga-vss) printf "%s" -Dqga_vss=3Ddisabled ;; --enable-qom-cast-debug) printf "%s" -Dqom_cast_debug=3Dtrue ;; --=20 2.41.0