From nobody Wed Feb 11 01:34:33 2026 Delivered-To: importer2@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+importer2=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 1651247734842374.98609276009324; Fri, 29 Apr 2022 08:55:34 -0700 (PDT) Received: from localhost ([::1]:53152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nkSxx-0006DM-RM for importer2@patchew.org; Fri, 29 Apr 2022 11:55:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44114) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nkSSs-00028M-ED for qemu-devel@nongnu.org; Fri, 29 Apr 2022 11:23:26 -0400 Received: from mail-ej1-x631.google.com ([2a00:1450:4864:20::631]:41603) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nkSSq-00069b-Nc for qemu-devel@nongnu.org; Fri, 29 Apr 2022 11:23:26 -0400 Received: by mail-ej1-x631.google.com with SMTP id dk23so16093906ejb.8 for ; Fri, 29 Apr 2022 08:23:24 -0700 (PDT) Received: from avogadro.redhat.com ([2001:b07:6468:f312:1c09:f536:3de6:228c]) by smtp.gmail.com with ESMTPSA id w25-20020a170907271900b006f3ef214dd6sm736395ejk.60.2022.04.29.08.23.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Apr 2022 08:23:22 -0700 (PDT) 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=eZe5XfwXTVI3O5zGujNaKUL1PtQPp4bviw9gZAV8t6c=; b=HK3gafuq1yYsLJFYVEoXShAVIBIB5EmufcZ0UOd/6iJPtU7/8pu4CGMKCt0UmSoiE4 5AzOTX+l0RwayXUc3EwbHw2wKRCHQ/X0asRYlJvY8puIzVq/W/V48cLuH0ORQKUZ4vwY pUxPWj7HCuxw12tEtr8KS7dWNyW2Lb4fzQeuAIuYT9oID4EyC0n6YxVVM2fRE0/ty4dc 02lte0CVpOMZbvIjMBweSAERk1anTKdIzTGli6DwgZrluHJ1N3Ms8871/OhrOOVDCL2G E6wELsalPs9CNsNaAsfRPv1Xbim2r3eUkHEEadODxaAYlOpiNApUvUhe/WJXljNnajrk 0O0Q== 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=eZe5XfwXTVI3O5zGujNaKUL1PtQPp4bviw9gZAV8t6c=; b=2iortfQkr8OKjOGCR2z41CBZMR3ejPa22p/Wcl1AHhCljr7ZqNTfd3l5N3cDSc6XS6 VGpFb6MsXt4YinjjjdIH88IpBA0jWsAp1NEJkktqyD4xjpwLzpVqPf5KtxBU7n149S7K v5cT4tH92NgHi9QmsDzUeRFSp8VVypZ4luWuQ5Q7MSOd1Jj3XVRoTpqzbohYeMEyGppS VITywhaXjynSfHkmEISweuVHf7ysr8vLkYZXdYD8Qbdarl/dSbb10+79hUk3l2fqC2ZJ SDieQMXwS9we6doazXVuuTwQhN7WsRHSxTFh7kxMTt6YedJsR+nSgI7HzlTwbJkiwtKs xFZg== X-Gm-Message-State: AOAM530/zARwd7gnUedouMzisSbYSf9eXkcNYtC021Tn1BCPwWBPaJKb DxEcArwGdxJLYWSKeXuznHzpRL3DyTtQ3A== X-Google-Smtp-Source: ABdhPJz4uKSC9Zd27lyGIntNOoDkqDaFxACIDWshgEMrzcEfOnW+3AUCAhGuArniFG0M/idZBrherQ== X-Received: by 2002:a17:906:a08b:b0:6cf:65bc:e7de with SMTP id q11-20020a170906a08b00b006cf65bce7demr37415885ejy.220.1651245803465; Fri, 29 Apr 2022 08:23:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/25] meson, configure: move --interp-prefix to meson Date: Fri, 29 Apr 2022 17:22:59 +0200 Message-Id: <20220429152312.335715-13-pbonzini@redhat.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220429152312.335715-1-pbonzini@redhat.com> References: <20220429152312.335715-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Type: text/plain 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::631; envelope-from=paolo.bonzini@gmail.com; helo=mail-ej1-x631.google.com X-Spam_score_int: -4 X-Spam_score: -0.5 X-Spam_bar: / X-Spam_report: (-0.5 / 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.249, PP_MIME_FAKE_ASCII_TEXT=0.999, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1651247735866100001 This is the last CONFIG_* entry in config-host.mak that had to be special cased. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 6 ------ meson.build | 6 ++---- meson_options.txt | 2 ++ scripts/meson-buildoptions.sh | 3 +++ 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/configure b/configure index b8d3d04072..4102683d75 100755 --- a/configure +++ b/configure @@ -231,7 +231,6 @@ fi =20 # default parameters cpu=3D"" -interp_prefix=3D"/usr/gnemul/qemu-%M" static=3D"no" cross_compile=3D"no" cross_prefix=3D"" @@ -697,8 +696,6 @@ for opt do ;; --prefix=3D*) prefix=3D"$optarg" ;; - --interp-prefix=3D*) interp_prefix=3D"$optarg" - ;; --cross-prefix=3D*) ;; --cc=3D*) @@ -1091,8 +1088,6 @@ Options: [defaults in brackets after descriptions] Standard options: --help print this message --prefix=3DPREFIX install in PREFIX [$prefix] - --interp-prefix=3DPREFIX where to find shared libraries, etc. - use %M for cpu name [$interp_prefix] --target-list=3DLIST set target list (default: build all) $(echo Available targets: $default_target_list | \ fold -s -w 53 | sed -e 's/^/ /') @@ -2289,7 +2284,6 @@ for target in $target_list; do esac done =20 -echo "CONFIG_QEMU_INTERP_PREFIX=3D$interp_prefix" | sed 's/%M/@0@/' >> $co= nfig_host_mak if test "$default_targets" =3D "yes"; then echo "CONFIG_DEFAULT_TARGETS=3Dy" >> $config_host_mak fi diff --git a/meson.build b/meson.build index 0ff752343a..83b06ca611 100644 --- a/meson.build +++ b/meson.build @@ -2227,10 +2227,8 @@ if targetos =3D=3D 'windows' and link_language =3D= =3D 'cpp' endif config_host_data.set('HAVE_VSS_SDK', have_vss_sdk) =20 -ignored =3D ['CONFIG_QEMU_INTERP_PREFIX', # actually per-target - 'HAVE_GDB_BIN'] foreach k, v: config_host - if k.startswith('CONFIG_') and not ignored.contains(k) + if k.startswith('CONFIG_') config_host_data.set(k, v =3D=3D 'y' ? 1 : v) endif endforeach @@ -2336,7 +2334,7 @@ foreach target : target_dirs config_target +=3D { 'CONFIG_USER_ONLY': 'y', 'CONFIG_QEMU_INTERP_PREFIX': - config_host['CONFIG_QEMU_INTERP_PREFIX'].format(config_target['TAR= GET_NAME']) + get_option('interp_prefix').replace('%M', config_target['TARGET_NA= ME']) } endif =20 diff --git a/meson_options.txt b/meson_options.txt index bdb45092ca..ae6c4b2475 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -27,6 +27,8 @@ option('block_drv_rw_whitelist', type : 'string', value := '', description: 'set block driver read-write whitelist (by default aff= ects only QEMU, not tools like qemu-img)') option('block_drv_ro_whitelist', type : 'string', value : '', description: 'set block driver read-only whitelist (by default affe= cts only QEMU, not tools like qemu-img)') +option('interp_prefix', type : 'string', value : '/usr/gnemul/qemu-%M', + description: 'where to find shared libraries etc., use %M for cpu n= ame') option('fuzzing_engine', type : 'string', value : '', description: 'fuzzing engine library for OSS-Fuzz') option('trace_file', type: 'string', value: 'trace', diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 3a86dd7271..59c4a27c5a 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -41,6 +41,8 @@ meson_options_help() { printf "%s\n" ' Set available tracing backends= [log] (choices:' printf "%s\n" ' dtrace/ftrace/log/nop/simple/s= yslog/ust)' printf "%s\n" ' --iasl=3DVALUE Path to ACPI disassembler' + printf "%s\n" ' --interp-prefix=3DVALUE where to find shared librari= es etc., use %M for' + printf "%s\n" ' cpu name [/usr/gnemul/qemu-%M]' printf "%s\n" ' --sphinx-build=3DVALUE Use specified sphinx-build f= or building document' printf "%s\n" ' --tls-priority=3DVALUE Default TLS protocol/cipher = priority string' printf "%s\n" ' [NORMAL]' @@ -252,6 +254,7 @@ _meson_option_parse() { --disable-iconv) printf "%s" -Diconv=3Ddisabled ;; --enable-install-blobs) printf "%s" -Dinstall_blobs=3Dtrue ;; --disable-install-blobs) printf "%s" -Dinstall_blobs=3Dfalse ;; + --interp-prefix=3D*) quote_sh "-Dinterp_prefix=3D$2" ;; --enable-jack) printf "%s" -Djack=3Denabled ;; --disable-jack) printf "%s" -Djack=3Ddisabled ;; --enable-keyring) printf "%s" -Dkeyring=3Denabled ;; --=20 2.35.1