From nobody Sat May 18 21:26:43 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=1603107892; cv=none; d=zohomail.com; s=zohoarc; b=ZEWNqCl4vxe6YfthzhuqVIKnungRJsphSQhzTigaOu57JIFLOf5el2OL/ya7kKWr8SGgHstfvyktiZbmoTIV+GFg1jlO1Oge25+z5KwBMxlN53yvEQlyfg3WT0JAt1g/nmCaZb1FfWQSaZggZmBZyKqhEhyNqy5SJCENFG59k+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603107892; h=Content-Type:Content-Transfer-Encoding:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=imURWLYKJS+A51CJcY/PS/bBsr96bRuJgtDpMzjyaU4=; b=KoiiiFeuxL7neoXjraNjJ4U2IIkgSHUZhx5P9yqI/BIJo056/WYsthFm6FDJKe3VEdWMsWLjEBkA35j0WLjnE3oFxe+ROArRdEQ+xk0TKV1kDykNicxk0Ql0oXJqoroo79UWaRVp39frtsFHsfMIYhB7EyMUkmK5rL8lyACimuY= 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 160310789291053.1128156679722; Mon, 19 Oct 2020 04:44:52 -0700 (PDT) Received: from localhost ([::1]:54060 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kUTat-000281-Q2 for importer@patchew.org; Mon, 19 Oct 2020 07:44:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUTXX-0007ob-Ta for qemu-devel@nongnu.org; Mon, 19 Oct 2020 07:41:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:26229) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kUTXR-0008G1-Ue for qemu-devel@nongnu.org; Mon, 19 Oct 2020 07:41:21 -0400 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-58-hjm_bP6ePjGMfc1Q1Q6GSg-1; Mon, 19 Oct 2020 07:41:10 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 424259CC0D for ; Mon, 19 Oct 2020 11:41:09 +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 0F4555C1A3 for ; Mon, 19 Oct 2020 11:41:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603107673; 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; bh=imURWLYKJS+A51CJcY/PS/bBsr96bRuJgtDpMzjyaU4=; b=GeuYlfg+sO5hFccVP/Ce+cI9OJfku7tin0qYpr8dH9blvLwHFNhl2ASB5zVbLnAmXsCCXu +E5GoxzEAK6AgznL8qOmzs6Ao2xYLOyv+jetxK+i/ymaKjhTMm09EZGpEkMrJYCrtAg9U2 IcENSArsuwNv22zUwteOvv4G2zFJSGE= X-MC-Unique: hjm_bP6ePjGMfc1Q1Q6GSg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] meson: use b_staticpic=false for meson >=0.56.0 Date: Mon, 19 Oct 2020 07:41:08 -0400 Message-Id: <20201019114108.1779369-2-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 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=63.128.21.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/19 02:32:01 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_H5=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 7b0589a0c4..b7253b1b8e 100755 --- a/configure +++ b/configure @@ -6987,6 +6987,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" \ @@ -7004,7 +7008,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 d1155aea65..88eb4a6b7a 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