From nobody Mon Feb 9 17:36:32 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 1641308886622816.9819646466142; Tue, 4 Jan 2022 07:08:06 -0800 (PST) Received: from localhost ([::1]:52946 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4lPx-0002mP-V9 for importer@patchew.org; Tue, 04 Jan 2022 10:08:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52510) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4lGU-00077O-Kh for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:18 -0500 Received: from [2a00:1450:4864:20::534] (port=36563 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 1n4lGS-0004Sv-EQ for qemu-devel@nongnu.org; Tue, 04 Jan 2022 09:58:17 -0500 Received: by mail-ed1-x534.google.com with SMTP id q14so141736008edi.3 for ; Tue, 04 Jan 2022 06:58:15 -0800 (PST) Received: from localhost.localdomain ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id j21sm11475964ejj.133.2022.01.04.06.58.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Jan 2022 06:58:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6PcERMUghxJSRl5rwd0mke+3ok8bkde8T6lIuSD9j10=; b=nuxxUjBdmfzMJ+W0KE5rNZ5KuS8MTeZ9uRLUX+/ed0mDgkJLVM6zf2ddnka/T6h9V2 PpAqkjezbCuGvcJWxqWPuPUjhvitydId8CtD9ubD+qJHWrJkPEZswWnAw+CE2GUEjv2z J1bcG+CQT2PIw5s/QuOdckA7MLKzYCrd7+3G9yIEc4LlPdCkcTi3Ckb6irMLI8A5SGGX HEhlK+RPe1d4B4dileG+rKDCzxU2/Qnu0mHP0Kc5lgDEFo/0MK1CwkEl73Xcu5Xtcrzi uSbRhzaEyVqdORYKySgz+6uG0kPbFrdaYbxwPMJ3ZUIrt1MY6WpQxZThb7JpaXjwwmJs ZL9g== 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:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=6PcERMUghxJSRl5rwd0mke+3ok8bkde8T6lIuSD9j10=; b=e8d0+bLnoN7O14rsQll99kSViEDufn3SwMpVB8DEWwNwZzJbYdFF8MMkvYCaXjeTcn yAMo1+mxrQKZGJWzd6PtiDxdwfIycEcLi09hxkiK4Z8odNi4gD6CYFNN2BS6jhKWoRIT zfuigmFGG5n7F5gZ+aBd8TYpZJjtPVU8+o65huWwdaUn2vcOvVnbTW6kMsrd9FDFGxWN 1nAHevJgwYjoKyxGFNRJBR8ztIVcANPVIbGJqv5pJ7zVa4YIzprOKEBneMtURNVVkuCc /dhr/G1oAe0s7Brc/H7qbFtBP6F6eHUpnuyV3JHpwGPtlTvNfhvIQaadSZdcZS/Be0En O0Tg== X-Gm-Message-State: AOAM532RBbG9PZvaGayJkXylPdr6mFLuvMBdcYq7uRTJekqG/QENCOml gN3MZzLEnV3c1drC6Ofo5i/9lVgwBKk= X-Google-Smtp-Source: ABdhPJzlQn8ey6R29zSRnfxw8hw7SOqoS616/H6JaSW+UD65/rTEeGLzKuPRXiowMvKuE+fb4V/HPg== X-Received: by 2002:a17:906:5d15:: with SMTP id g21mr38702432ejt.350.1641308294449; Tue, 04 Jan 2022 06:58:14 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/15] configure: parse --enable/--disable-strip automatically, flip default Date: Tue, 4 Jan 2022 15:57:42 +0100 Message-Id: <20220104145749.417387-9-pbonzini@redhat.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20220104145749.417387-1-pbonzini@redhat.com> References: <20220104145749.417387-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: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) 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: , 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: 1641308888633100001 Content-Type: text/plain; charset="utf-8" Always include the STRIP variable in config-host.mak (it's only used by the s390-ccw firmware build, and it adds a default if configure omitted it), and use meson-buildoptions.sh to turn --enable/--disable-strip into -Dstrip. The default is now not to strip the binaries like for almost every other package that has a configure script. Signed-off-by: Paolo Bonzini --- configure | 10 +--------- pc-bios/s390-ccw/Makefile | 2 -- scripts/meson-buildoptions.py | 21 ++++++++++++++------- scripts/meson-buildoptions.sh | 3 +++ 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/configure b/configure index 851eb35dbe..9e01b2278e 100755 --- a/configure +++ b/configure @@ -307,7 +307,6 @@ debug=3D"no" sanitizers=3D"no" tsan=3D"no" fortify_source=3D"$default_feature" -strip_opt=3D"yes" mingw32=3D"no" gcov=3D"no" EXESUF=3D"" @@ -892,7 +891,6 @@ for opt do debug_tcg=3D"yes" debug_mutex=3D"yes" debug=3D"yes" - strip_opt=3D"no" fortify_source=3D"no" ;; --enable-sanitizers) sanitizers=3D"yes" @@ -903,8 +901,6 @@ for opt do ;; --disable-tsan) tsan=3D"no" ;; - --disable-strip) strip_opt=3D"no" - ;; --disable-slirp) slirp=3D"disabled" ;; --enable-slirp) slirp=3D"enabled" @@ -1367,7 +1363,6 @@ Advanced options (experts only): --enable-debug enable common debug build options --enable-sanitizers enable default sanitizers --enable-tsan enable thread sanitizer - --disable-strip disable stripping binaries --disable-werror disable compilation abort on warning --disable-stack-protector disable compiler-provided stack protection --audio-drv-list=3DLIST set audio drivers to try if -audiodev is not = used @@ -3314,9 +3309,6 @@ echo "GIT_SUBMODULES_ACTION=3D$git_submodules_action"= >> $config_host_mak if test "$debug_tcg" =3D "yes" ; then echo "CONFIG_DEBUG_TCG=3Dy" >> $config_host_mak fi -if test "$strip_opt" =3D "yes" ; then - echo "STRIP=3D${strip}" >> $config_host_mak -fi if test "$mingw32" =3D "yes" ; then echo "CONFIG_WIN32=3Dy" >> $config_host_mak if test "$guest_agent_with_vss" =3D "yes" ; then @@ -3594,6 +3586,7 @@ echo "GLIB_LIBS=3D$glib_libs" >> $config_host_mak echo "GLIB_VERSION=3D$(pkg-config --modversion glib-2.0)" >> $config_host_= mak echo "QEMU_LDFLAGS=3D$QEMU_LDFLAGS" >> $config_host_mak echo "LD_I386_EMULATION=3D$ld_i386_emulation" >> $config_host_mak +echo "STRIP=3D$strip" >> $config_host_mak echo "EXESUF=3D$EXESUF" >> $config_host_mak echo "LIBS_QGA=3D$libs_qga" >> $config_host_mak =20 @@ -3811,7 +3804,6 @@ if test "$skip_meson" =3D no; then -Doptimization=3D$(if test "$debug" =3D yes; then echo 0; else ech= o 2; fi) \ -Ddebug=3D$(if test "$debug_info" =3D yes; then echo true; else ec= ho false; fi) \ -Dwerror=3D$(if test "$werror" =3D yes; then echo true; else echo = false; fi) \ - -Dstrip=3D$(if test "$strip_opt" =3D yes; then echo true; else ech= o false; fi) \ -Db_pie=3D$(if test "$pie" =3D yes; then echo true; else echo fals= e; fi) \ -Db_coverage=3D$(if test "$gcov" =3D yes; then echo true; else ech= o false; fi) \ -Db_lto=3D$lto -Dcfi=3D$cfi -Dtcg=3D$tcg -Dxen=3D$xen \ diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile index cee9d2c63b..0eb68efc7b 100644 --- a/pc-bios/s390-ccw/Makefile +++ b/pc-bios/s390-ccw/Makefile @@ -44,8 +44,6 @@ build-all: s390-ccw.img s390-netboot.img s390-ccw.elf: $(OBJECTS) $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $(OBJECTS),"BUILD","$(TARGET_= DIR)$@") =20 -STRIP ?=3D strip - s390-ccw.img: s390-ccw.elf $(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,"STRIP","$(TARGET= _DIR)$@") =20 diff --git a/scripts/meson-buildoptions.py b/scripts/meson-buildoptions.py index 96969d89ee..98ae944148 100755 --- a/scripts/meson-buildoptions.py +++ b/scripts/meson-buildoptions.py @@ -36,6 +36,10 @@ "trace_file", } =20 +BUILTIN_OPTIONS =3D { + "strip", +} + LINE_WIDTH =3D 76 =20 =20 @@ -90,14 +94,17 @@ def allow_arg(opt): return not (set(opt["choices"]) <=3D {"auto", "disabled", "enabled"}) =20 =20 +def filter_options(json): + if ":" in json["name"]: + return False + if json["section"] =3D=3D "user": + return json["name"] not in SKIP_OPTIONS + else: + return json["name"] in BUILTIN_OPTIONS + + def load_options(json): - json =3D [ - x - for x in json - if x["section"] =3D=3D "user" - and ":" not in x["name"] - and x["name"] not in SKIP_OPTIONS - ] + json =3D [x for x in json if filter_options(x)] return sorted(json, key=3Dlambda x: x["name"]) =20 =20 diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index 50bd7bed4d..a4af02c527 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -13,6 +13,7 @@ meson_options_help() { printf "%s\n" ' jemalloc/system/tcmalloc)' printf "%s\n" ' --enable-slirp[=3DCHOICE] Whether and how to find the = slirp library' printf "%s\n" ' (choices: auto/disabled/enable= d/internal/system)' + printf "%s\n" ' --enable-strip Strip targets on install' printf "%s\n" ' --enable-tcg-interpreter TCG with bytecode interpreter = (slow)' printf "%s\n" ' --enable-trace-backends=3DCHOICE' printf "%s\n" ' Set available tracing backends= [log] (choices:' @@ -237,6 +238,8 @@ _meson_option_parse() { --disable-spice) printf "%s" -Dspice=3Ddisabled ;; --enable-spice-protocol) printf "%s" -Dspice_protocol=3Denabled ;; --disable-spice-protocol) printf "%s" -Dspice_protocol=3Ddisabled ;; + --enable-strip) printf "%s" -Dstrip=3Dtrue ;; + --disable-strip) printf "%s" -Dstrip=3Dfalse ;; --enable-tcg) printf "%s" -Dtcg=3Denabled ;; --disable-tcg) printf "%s" -Dtcg=3Ddisabled ;; --enable-tcg-interpreter) printf "%s" -Dtcg_interpreter=3Dtrue ;; --=20 2.33.1