From nobody Mon Nov 17 16:02:06 2025 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=1604502624; cv=none; d=zohomail.com; s=zohoarc; b=Bnp8+whyoG4msR7piz3l6+xLmJg7MRkFOJ7qiKaXnYN8JrsZ1s2i98K4+1+sQbneKNdqQOannYlkeixYInvvE1d+7m4m7HSodPJsviAW5Rxh5KDwoe7y1rEH5UOMwiZ7hehhjM/Ol4mTV6xg16ndTtVaZzgvXgpLKjSC3X6ZsjY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604502624; 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=J2klcdRVHrLD903yYHqI7Na7zwJnyvtU1u1DjM6UTAA=; b=Q1DRFl3JzHyWAnpCkpT59VMHfaOHemaKwaGaH0piDVCrJu9MLwO+8p7Yns1Wrci0AuFInLdXli2IGPGTUispE4c1Zk/fk6TgGhYXErn1S+K+nH9Rq9Tz/IW/s7cTAdiw1hFlrLLJkjm+v93LIh3+eRVrRSdmT7xSt2vG0mXPjS4= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1604502624052627.7365482727679; Wed, 4 Nov 2020 07:10:24 -0800 (PST) Received: from localhost ([::1]:45292 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kaKQX-0006TR-SZ for importer@patchew.org; Wed, 04 Nov 2020 10:10:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55354) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kaKIb-00033S-2P for qemu-devel@nongnu.org; Wed, 04 Nov 2020 10:02:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:35312) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kaKIU-00061u-93 for qemu-devel@nongnu.org; Wed, 04 Nov 2020 10:02:08 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-87-lpBDnK2AMJqHuU1W1s6buQ-1; Wed, 04 Nov 2020 10:01:59 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 19C851016CE2 for ; Wed, 4 Nov 2020 15:01:58 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id D086E1007505 for ; Wed, 4 Nov 2020 15:01:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604502121; 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=J2klcdRVHrLD903yYHqI7Na7zwJnyvtU1u1DjM6UTAA=; b=Vl7C3oQcuV1WyWluhbfyogUBoGMp9a6XDGngHgmi1ydZTP1EId6vngFNJnX20rhj7R8ae7 /oH+PwdplST2xmPSPnqLWERUx/WNJoFV07w+fCfX+SLlykn7i6reDPJihsNnXhzGMcSCPf jpiJhTxr+CDMoguDdMsRcDpg+KBYceg= X-MC-Unique: lpBDnK2AMJqHuU1W1s6buQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/20] meson: use b_staticpic=false for meson >=0.56.0 Date: Wed, 4 Nov 2020 10:01:40 -0500 Message-Id: <20201104150153.541326-8-pbonzini@redhat.com> In-Reply-To: <20201104150153.541326-1-pbonzini@redhat.com> References: <20201104150153.541326-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 00:03:41 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] 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.23 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: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Meson 0.56.0 correctly builds non-PIC static libraries with -fPIE if b_pie=3Dtrue. We do not have to pass b_staticpic=3Dtrue if PIE is requested if Meson is new-enough, which improves performance. Signed-off-by: Paolo Bonzini --- configure | 6 +++++- meson.build | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 2c3c69f118..c87c1dfbf3 100755 --- a/configure +++ b/configure @@ -6961,6 +6961,10 @@ fi mv $cross config-meson.cross =20 rm -rf meson-private meson-info meson-logs +unset staticpic +if ! version_ge "$($meson --version)" 0.56.0; then + staticpic=3D$(if test "$pie" =3D yes; then echo true; else echo false; f= i) +fi NINJA=3D$ninja $meson setup \ --prefix "$prefix" \ --libdir "$libdir" \ @@ -6980,7 +6984,7 @@ NINJA=3D$ninja $meson setup \ -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_staticpic=3D$(if test "$pie" =3D yes; then echo true; else ech= o false; fi) \ + ${staticpic:+-Db_staticpic=3D$staticpic} \ -Db_coverage=3D$(if test "$gcov" =3D yes; then echo true; else ech= o false; fi) \ -Dmalloc=3D$malloc -Dmalloc_trim=3D$malloc_trim -Dsparse=3D$sparse= \ -Dkvm=3D$kvm -Dhax=3D$hax -Dwhpx=3D$whpx -Dhvf=3D$hvf \ diff --git a/meson.build b/meson.build index 39ac5cf6d8..f5175010df 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('qemu', ['c'], meson_version: '>=3D0.55.0', - default_options: ['warning_level=3D1', 'c_std=3Dgnu99', 'cpp_std= =3Dgnu++11', - 'b_colorout=3Dauto'], + default_options: ['warning_level=3D1', 'c_std=3Dgnu99', 'cpp_std= =3Dgnu++11', 'b_colorout=3Dauto'] + + (meson.version().version_compare('>=3D0.56.0') ? = [ 'b_staticpic=3Dfalse' ] : []), version: run_command('head', meson.source_root() / 'VERSION').stdo= ut().strip()) =20 not_found =3D dependency('', required: false) --=20 2.26.2