From nobody Sun Nov 16 04:03:38 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1598547714; cv=none; d=zohomail.com; s=zohoarc; b=MYMr13JcyLClXuMryiEOhCLTw1Uyn9/wHZbculGu8CDNCcPohsZD7pW1rXF/sL1YZEM7h5YfsFaUNx4WIbdfhPBZx+MAGQF216fICMJAwb+HxsdibPkhGQkPjWla6Y/91LnIBY/t/7YaIamxAOVfkAgCRtrJfAv8y/LtwPlRpe8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598547714; h=Content-Type:Content-Transfer-Encoding:Cc: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=u0cU2pKxq8BAQpdJNYqHz0FvSzVLfYh0AUYliRmr3zg=; b=G/zapxBWwSiwHDjGx3SGvkqVS4EcqpJrmT+yS7D/C0dbcArpE/D6kixYazA+f2emk6e3SCiqChAPRu5khYjEoo+PToYRJWA+37hMIui8JvNty8uwH+Nd+j7RLGf1h/HI3rpCU32oCYD/njuUgRvK8X5TB+gQ4bOsBWVb/pMVsoc= ARC-Authentication-Results: i=1; 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 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 1598547714339798.4253625150203; Thu, 27 Aug 2020 10:01:54 -0700 (PDT) Received: from localhost ([::1]:37226 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLHc-0007T9-H1 for importer@patchew.org; Thu, 27 Aug 2020 13:01:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50684) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLFy-0005pQ-6D for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:11 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:26704 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLFw-0005Mn-00 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:09 -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-321-yv4aXGMfOW6jhEfQ5wlI9g-1; Thu, 27 Aug 2020 13:00:02 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AEC1D1074655; Thu, 27 Aug 2020 17:00:00 +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 A49CB7843F; Thu, 27 Aug 2020 16:59:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547605; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u0cU2pKxq8BAQpdJNYqHz0FvSzVLfYh0AUYliRmr3zg=; b=FNi94mNV8YqaGC9W3i6uWPw+56zugzIO9LL46sIxeFBHsRgz2WAE1efESKxZffOGMOrlGr XiJFiDc9teWLzz1qQAE9ZqkCV8PSkPfctQxdNjfknRYdzZcgX9jiap1lBPrK5I4fWHjUhf PS8H3Wgj9aBwlfAfdvR2SDHNT4PVOc4= X-MC-Unique: yv4aXGMfOW6jhEfQ5wlI9g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 01/17] trace: fix creation of systemtap files Date: Thu, 27 Aug 2020 12:59:40 -0400 Message-Id: <20200827165956.12925-2-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:56:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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_H2=-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: , Cc: Peter Maydell , Stefan Hajnoczi Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Stefan Hajnoczi The "exe_name" variable was renamed to exe['name'], so systemtap files fail to build. Reported-by: Peter Maydell Signed-off-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini --- meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index f0fe5f8799..f2aa5a7700 100644 --- a/meson.build +++ b/meson.build @@ -1029,14 +1029,14 @@ foreach target : target_dirs =20 if 'CONFIG_TRACE_SYSTEMTAP' in config_host foreach stp: [ - {'ext': '.stp-build', 'fmt': 'stap', 'bin': meson.current_build_di= r() / exe_name, 'install': false}, - {'ext': '.stp', 'fmt': 'stap', 'bin': get_option('prefix') / get_o= ption('bindir') / exe_name, 'install': true}, + {'ext': '.stp-build', 'fmt': 'stap', 'bin': meson.current_build_di= r() / exe['name'], 'install': false}, + {'ext': '.stp', 'fmt': 'stap', 'bin': get_option('prefix') / get_o= ption('bindir') / exe['name'], 'install': true}, {'ext': '-simpletrace.stp', 'fmt': 'simpletrace-stap', 'bin': '', = 'install': true}, {'ext': '-log.stp', 'fmt': 'log-stap', 'bin': '', 'install': true}, ] - custom_target(exe_name + stp['ext'], + custom_target(exe['name'] + stp['ext'], input: trace_events_all, - output: exe_name + stp['ext'], + output: exe['name'] + stp['ext'], capture: true, install: stp['install'], install_dir: config_host['qemu_datadir'] / '../syste= mtap/tapset', --=20 2.26.2 From nobody Sun Nov 16 04:03:38 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1598547717; cv=none; d=zohomail.com; s=zohoarc; b=MLCB/17+SndM/mKGn97XQCbWPfP1t2GwCLdODKEfC9UnxMqCc9CVwwM1LmtFcJ39Oiqdr9zgsnSio59JLOcSyjeqIKJ8wqm5dmIyfSI6avS3nVGmUfYDHHCThnmPIWUkix6QYe6Ml9Ha8LBe35N72VXs8CAI1bPgn4ULrfwlqE4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598547717; h=Content-Type:Content-Transfer-Encoding:Cc: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=EnjvU88cAwFF+qc9CW8oMqgJGUmWasA62ifrpCJGzYE=; b=C58aGenFvg9BxplweM561TXTgRfDIhd3+LwsYY5l2clrN/yOZ37tEApbLEmn6Z9lZot5tH77A8LCilmYKl9kPFF4Rq2calTeUopXMMxmAx8DvdzV7dlEAzCB04fm4GLRxZCgYk5d8T5Pp3xtdumGvocX2+tKuJsIGgrxaK9IIzE= ARC-Authentication-Results: i=1; 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 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 1598547717443443.97586238961765; Thu, 27 Aug 2020 10:01:57 -0700 (PDT) Received: from localhost ([::1]:37504 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLHf-0007bn-Sk for importer@patchew.org; Thu, 27 Aug 2020 13:01:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50698) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLG1-0005pm-Ip for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:13 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:21291 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLFw-0005Mv-11 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:13 -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-411-_LTGKjY0NjqV6bNAo0GkPQ-1; Thu, 27 Aug 2020 13:00:04 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E72EB1009637 for ; Thu, 27 Aug 2020 17:00:03 +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 CAB8778426; Thu, 27 Aug 2020 17:00:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=EnjvU88cAwFF+qc9CW8oMqgJGUmWasA62ifrpCJGzYE=; b=RljYEWr7qcRDiBrPFsbjCN3mXRwV2T5egapncJZl9hlfd4sP/oUPGjPhPotkhEnSFyluOp /3Z1aZAnZ+NzrA/mE2Lt8JeKokA+kj7kK3AgcV1w4CvWByDIjwt0ZvXIE3p5lW0npjvNg9 Fdg/BmbUo8hHhmSFVaXE2hSbY+5MaJg= X-MC-Unique: _LTGKjY0NjqV6bNAo0GkPQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/17] meson: Build qemu-nbd on macOS again Date: Thu, 27 Aug 2020 12:59:41 -0400 Message-Id: <20200827165956.12925-3-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:56:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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_H2=-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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth Before switching to the meson build system, we used to compile qemu-nbd for macOS, too, which is especially important for running the iotests there. Commit b7c70bf2c5 disabled it by accident, since it did not take into consideration that the $bsd variable in the configure script was also set to "yes" on macOS. Fix it by enabling qemu-nbd on all systems but Windows now instead (which was likely the original intention of the old code in the configure script). Fixes: b7c70bf2c5 ("meson: qemu-{img,io,nbd}") Signed-off-by: Thomas Huth Acked-by: Eric Blake Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index f2aa5a7700..38d0abc0ea 100644 --- a/meson.build +++ b/meson.build @@ -1081,7 +1081,7 @@ if have_tools qemu_io =3D executable('qemu-io', files('qemu-io.c'), dependencies: [block, qemuutil], install: true) qemu_block_tools +=3D [qemu_img, qemu_io] - if targetos =3D=3D 'linux' or targetos =3D=3D 'sunos' or targetos.endswi= th('bsd') + if targetos !=3D 'windows' qemu_nbd =3D executable('qemu-nbd', files('qemu-nbd.c'), dependencies: [block, qemuutil], install: true) qemu_block_tools +=3D [qemu_nbd] --=20 2.26.2 From nobody Sun Nov 16 04:03:38 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=1598547806; cv=none; d=zohomail.com; s=zohoarc; b=Q/DvjJ8QY+J8jmR8GwlichMMHL4oj+3/lEZ5+djHgjmK/kygnc29KQFqyLj4wXU2x153L643jqIZVTsIarTEzaDbyXnezo8x6AwHBBIM0VRSOFVKy3rgMejxNSFJqfiZO55i7Og25CuoD3qD7Bb97V8OblFKFuc+yVZK6R1ZI20= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598547806; h=Content-Type:Content-Transfer-Encoding:Cc: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=beY3kFvLNmWOLPxSPAK7cU5mBUfTPlm8BxgoyknGAsI=; b=jEq1yILiXmFGeiy7x7o5sSfGSszwmlnVgjMj8iQW+An6E6zM6JkcOn8+BQS+oRyRusYvM9hmoE1g5bgzESSJTjUnsfzeG9Iz+jMxGmrLhdxFgL+3jZZl3ihtiNKT1YJTp8Ib/qXoa8Gobh4GoLffmwuio+HggklzcJ3ct9fCyVQ= 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 1598547806292323.3594179148548; Thu, 27 Aug 2020 10:03:26 -0700 (PDT) Received: from localhost ([::1]:45596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLJ6-0002Sl-Lm for importer@patchew.org; Thu, 27 Aug 2020 13:03:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50728) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLG6-0005wG-D9 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:49138) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLG4-0005NS-Fl for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:18 -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-80-uuPyhgwjPzyvZVvBAmZjAA-1; Thu, 27 Aug 2020 13:00:07 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AAD5B873115; Thu, 27 Aug 2020 17:00:06 +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 0D66D50B3F; Thu, 27 Aug 2020 17:00:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=beY3kFvLNmWOLPxSPAK7cU5mBUfTPlm8BxgoyknGAsI=; b=Y88u6kFA1pv02QR9dU7IcXZh34nYsydSz0PxNaiuGyPKG1/gaNSq8P2B36My7ACXgJzeBV wWSpJqLWFkJaOQ4mzrVN/oDtIYs1/cqBSGvVRzv/mnTn2bZw5/L5FOSQS+kuLNAYIV8XSz Bf6bNhW5op3gUpVA2pyj8ADDeBg88io= X-MC-Unique: uuPyhgwjPzyvZVvBAmZjAA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 03/17] meson: Don't make object files for dtrace on macOS Date: Thu, 27 Aug 2020 12:59:42 -0400 Message-Id: <20200827165956.12925-4-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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/08/27 02:54:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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: , Cc: Roman Bolshakov , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Cameron Esfahani Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Roman Bolshakov dtrace on macOS uses unresolved symbols with a special prefix to define probes [1], only headers should be generated for USDT (dtrace(1)). But it doesn't support backwards compatible no-op -G flag [2] and implicit build rules fail. 1. https://markmail.org/message/6grq2ygr5nwdwsnb 2. https://markmail.org/message/5xrxt2w5m42nojkz Cc: Daniel P. Berrang=C3=A9 Cc: Cameron Esfahani Signed-off-by: Roman Bolshakov Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Paolo Bonzini --- trace/meson.build | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/trace/meson.build b/trace/meson.build index 56e870848e..1c1fb31a61 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -39,12 +39,15 @@ foreach dir : [ '.' ] + trace_events_subdirs output: fmt.format('trace-dtrace', 'h'), input: trace_dtrace, command: [ 'dtrace', '-o', '@OUTPUT@', = '-h', '-s', '@INPUT@' ]) - trace_dtrace_o =3D custom_target(fmt.format('trace-dtrace', 'o'), - output: fmt.format('trace-dtrace', 'o'), - input: trace_dtrace, - command: [ 'dtrace', '-o', '@OUTPUT@', = '-G', '-s', '@INPUT@' ]) + trace_ss.add(trace_dtrace_h) + if host_machine.system() !=3D 'darwin' + trace_dtrace_o =3D custom_target(fmt.format('trace-dtrace', 'o'), + output: fmt.format('trace-dtrace', 'o= '), + input: trace_dtrace, + command: [ 'dtrace', '-o', '@OUTPUT@'= , '-G', '-s', '@INPUT@' ]) + trace_ss.add(trace_dtrace_o) + endif =20 - trace_ss.add(trace_dtrace_h, trace_dtrace_o) genh +=3D trace_dtrace_h endif endforeach --=20 2.26.2 From nobody Sun Nov 16 04:03:38 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1598547891; cv=none; d=zohomail.com; s=zohoarc; b=ELRQVIgZ6GbcL+ukURbGSAbhd8uxaAtYi9qTykIzDOW99FO0tY9JcNGyDCZVkYQwyn2jN3kM9XwrRqffVJ1GKmZV05a7NxRcDRr7hiOrHuT6K+LE5RmmBLw/wBLmdXQseULSbrnV6P+Ze7vMtELmLx3kiNf5YzOMtXH2rxLdYKw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598547891; h=Content-Type:Content-Transfer-Encoding:Cc: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=n87LvUI34eDV8ckRsEq8wHR+i1VnZmrbb/QxEMfgWHw=; b=Bg5HP9pMPiqBYsc174JU5hPYZLWV1l8bB+mYpC3ipnZGqwDjaj8YC4uCEzT9sDmH1ut0avdDp2F/snnAUYVhrOGWGwIbLUJTEmJpHNYWVCIOENug67BR0/MJJL1k4QiNx/bg41BM0h6cgni8BPdcbFXHCmT6+GfzGVe4WP901TQ= ARC-Authentication-Results: i=1; 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 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 1598547891508381.4419894919969; Thu, 27 Aug 2020 10:04:51 -0700 (PDT) Received: from localhost ([::1]:53974 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLKU-0005qn-9I for importer@patchew.org; Thu, 27 Aug 2020 13:04:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50824) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLGC-00066T-Ey for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:24 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:46904 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLG9-0005Os-Ij for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:24 -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-345-G73ApLG3M0i-LR2NKApb3Q-1; Thu, 27 Aug 2020 13:00:18 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 36038802B76 for ; Thu, 27 Aug 2020 17:00:17 +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 C4EBF50B3F; Thu, 27 Aug 2020 17:00:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=n87LvUI34eDV8ckRsEq8wHR+i1VnZmrbb/QxEMfgWHw=; b=c5WldvAPBtpnHVpARt1pBX6xVzX2TXaY4JcK9bAnfGtU5hvbxrxY/Fx59jxPO63FRXTcOC D8XsbD3IC2d1g8ouheZMJc5nWMz2UGQgiCSrUyNV0L5QMdJY0u49OwGfBUEocc6UUJ5JEc 1tW+1jqRVeEmOG1MHx5O0Zfx1OTUp2U= X-MC-Unique: G73ApLG3M0i-LR2NKApb3Q-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/17] scripts/qemu-version.sh: Add missing space before ']' Date: Thu, 27 Aug 2020 12:59:43 -0400 Message-Id: <20200827165956.12925-5-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=207.211.31.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 02:56:52 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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_H2=-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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Thomas Huth When configure has been run with --with-pkgversion=3Dxyz, the shell complai= ns about a missing ']' in this script. Fixes: 2c273f32d3 ("meson: generate qemu-version.h") Signed-off-by: Thomas Huth Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- scripts/qemu-version.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/qemu-version.sh b/scripts/qemu-version.sh index 4847385e42..03128c56a2 100755 --- a/scripts/qemu-version.sh +++ b/scripts/qemu-version.sh @@ -6,7 +6,7 @@ dir=3D"$1" pkgversion=3D"$2" version=3D"$3" =20 -if [ -z "$pkgversion"]; then +if [ -z "$pkgversion" ]; then cd "$dir" if [ -e .git ]; then pkgversion=3D$(git describe --match 'v*' --dirty | echo "") --=20 2.26.2 From nobody Sun Nov 16 04:03:38 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1598548104; cv=none; d=zohomail.com; s=zohoarc; b=TH0kosZEaJnrFYYAs39hnpQE8nbb01+DP8908DjlCV44zxIHP42Jdc+N7LiZeuruR9Kk0PqUEWu1yMxC8W1e594hC5aB/u5PEoDcLftrZOU1Tr5LLVFNRdiA8D0SWtWj6c0hCwmPdq/8kScXPjuHH8v9E2aT1ojz4Oa/3vLblNU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598548104; h=Content-Type:Content-Transfer-Encoding:Cc: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=AimggI63mz5uiW4qcXKMmenPxfcEt+6Z3zILbLl4Zv0=; b=mkt8cB7GMiAs7wMv83SFmMcY7iv94BGJqOH4SL6u0VPFZYaeLdYjBSWj10a/SOxRD56DEuzr8dv0TiwZ2ClgTA8BgsGL9e9Hj79njh3OL/LoGZ8DWM18UokHjM9H/iJW9WdUnm8x8V3/DzwrBKvaB22iy1L/5KgVDeU9B78j2UA= ARC-Authentication-Results: i=1; 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 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 1598548104624223.71966662971283; Thu, 27 Aug 2020 10:08:24 -0700 (PDT) Received: from localhost ([::1]:38202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLNu-0002bx-6U for importer@patchew.org; Thu, 27 Aug 2020 13:08:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLGD-000695-U9 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:25 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:32361) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLGA-0005Qh-TD for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:25 -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-468-tr3jK5aMMYSEOhKEF5eLkg-1; Thu, 27 Aug 2020 13:00:18 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A8B68189E618; Thu, 27 Aug 2020 17:00:17 +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 5185150B3F; Thu, 27 Aug 2020 17:00:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AimggI63mz5uiW4qcXKMmenPxfcEt+6Z3zILbLl4Zv0=; b=Pc0Vh8RPaKxrqpCc/4/BDxjOLVCLVMeNKV2D4tsL1PkuzN2gorqZLJAoqPsT9n9WoKRYCx fBDJbNvqQB4042BJptdPud3mK/NhNlJsMO2XXRUiE2ys16SRFkpKjCP+fKZOvhZlZuj4yJ zPxpTs8hrUHiqPQ98M0fncDd0UTxxzY= X-MC-Unique: tr3jK5aMMYSEOhKEF5eLkg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/17] meson: Fix meson build with --enable-libdaxctl Date: Thu, 27 Aug 2020 12:59:44 -0400 Message-Id: <20200827165956.12925-6-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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/08/27 02:54:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Bruce Rogers Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Bruce Rogers The daxctl library needs to be linked against when daxctl is asked for in configure. Signed-off-by: Bruce Rogers Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 1 + meson.build | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/configure b/configure index b1e11397a8..a3f95f2b22 100755 --- a/configure +++ b/configure @@ -7467,6 +7467,7 @@ fi =20 if test "$libdaxctl" =3D "yes" ; then echo "CONFIG_LIBDAXCTL=3Dy" >> $config_host_mak + echo "LIBDAXCTL_LIBS=3D$libdaxctl_libs" >> $config_host_mak fi =20 if test "$bochs" =3D "yes" ; then diff --git a/meson.build b/meson.build index 38d0abc0ea..b44901dfe1 100644 --- a/meson.build +++ b/meson.build @@ -380,6 +380,10 @@ if 'CONFIG_LIBPMEM' in config_host libpmem =3D declare_dependency(compile_args: config_host['LIBPMEM_CFLAGS= '].split(), link_args: config_host['LIBPMEM_LIBS'].spli= t()) endif +libdaxctl =3D not_found +if 'CONFIG_LIBDAXCTL' in config_host + libdaxctl =3D declare_dependency(link_args: config_host['LIBDAXCTL_LIBS'= ].split()) +endif =20 # Create config-host.h =20 @@ -787,7 +791,7 @@ common_ss.add(files('cpus-common.c')) =20 subdir('softmmu') =20 -specific_ss.add(files('disas.c', 'exec.c', 'gdbstub.c'), capstone, libpmem) +specific_ss.add(files('disas.c', 'exec.c', 'gdbstub.c'), capstone, libpmem= , libdaxctl) specific_ss.add(files('exec-vary.c')) specific_ss.add(when: 'CONFIG_TCG', if_true: files( 'fpu/softfloat.c', --=20 2.26.2 From nobody Sun Nov 16 04:03:38 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1598548007; cv=none; d=zohomail.com; s=zohoarc; b=S87dYtb5u5vI+HGitpTAfOa/+fRRjfqDnlxxfB+jTRDx80s0mR+blvnxOCy1MdPY5L4MmZya3lJKRafYZpINrpOhyakobNvHZvG4/+Ogy9dB/gu9i0f1F6Xj+K/wKJDrnv4/LoOu4dLbPC3lmnUbXXrTOJHv2FkPBYR81v9/0Ao= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598548007; h=Content-Type:Content-Transfer-Encoding:Cc: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=Rdhf1SEccPCnHKjVmetN+WeOeWXLm8RfMWFO534rBlM=; b=SRiuoRxMYFV3gMWkOFAPdp6c4sbUuS/rf9JdmdtcYUKTlA1ukQ7wOIwoVp8xThdeLaTV3XWV3WEcE9yTGWSeT5WS1hSNq+WjGrcmBhLBAEzU26cjKOBAoQlgXBVbEbB/8Np1y3ZpxzXMWTUbS1u/nD8+O5/r9L4OOpTjaQfJioI= ARC-Authentication-Results: i=1; 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 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 1598548007318796.4711224450272; Thu, 27 Aug 2020 10:06:47 -0700 (PDT) Received: from localhost ([::1]:32870 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLMM-0000N0-3i for importer@patchew.org; Thu, 27 Aug 2020 13:06:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLGC-00066X-HD for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:49263) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLGA-0005QD-E3 for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:24 -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-391-pnRVg9uVNIGd2IxuZCGUfg-1; Thu, 27 Aug 2020 13:00:19 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2A12E802B6D; Thu, 27 Aug 2020 17:00:18 +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 C3BDC50B3F; Thu, 27 Aug 2020 17:00:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Rdhf1SEccPCnHKjVmetN+WeOeWXLm8RfMWFO534rBlM=; b=a/erwrqM6nkXnG9xGuHbzJCPjyjrces/wJcEZITxKLpQ+GxEzy9ykmbmc+JoIvI69j2OsC yVDopU2CNQRnR0N0CDPLYpWmRFzWg+Ze7IPg1ueY0Ou+eZyh6KifcG2cwj3dWxzHCdKM1U 8sVBA0+ls7sOWkb1wjsdk9q/HLhqeFY= X-MC-Unique: pnRVg9uVNIGd2IxuZCGUfg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 06/17] meson: Fix chardev-baum.so name Date: Thu, 27 Aug 2020 12:59:45 -0400 Message-Id: <20200827165956.12925-7-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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/08/27 02:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Bruce Rogers Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Bruce Rogers Somehow in the conversion to meson, the module named chardev-baum got renamed to chardev-brlapi. Change it back. Signed-off-by: Bruce Rogers Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- chardev/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chardev/meson.build b/chardev/meson.build index a46a6237be..7726837e34 100644 --- a/chardev/meson.build +++ b/chardev/meson.build @@ -39,7 +39,7 @@ chardev_modules =3D {} if config_host.has_key('CONFIG_BRLAPI') and sdl.found() module_ss =3D ss.source_set() module_ss.add(when: [sdl, brlapi], if_true: files('baum.c')) - chardev_modules +=3D { 'brlapi': module_ss } + chardev_modules +=3D { 'baum': module_ss } endif =20 modules +=3D { 'chardev': chardev_modules } --=20 2.26.2 From nobody Sun Nov 16 04:03:38 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1598547818; cv=none; d=zohomail.com; s=zohoarc; b=PHMzgcneMp2vTgM2rYidwBmSvK5xo6HFFptE70ZQkCiJ9/smBaCQmLyX8ODhZ7qf9hcnUZjqg76eYE0I131cXzl/SLfs+AKPCIGyOrXF88ZfKNqKIDW7RIA4bFsWNNB3RvAKS4Qq9BlhrZfgZSMRBbJxOzMH0sNaikWDZmPbsnI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598547818; h=Content-Type:Content-Transfer-Encoding:Cc: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=KF9SiR0HyK9h6SoUntBhr4RRkjYw/qK9hQ054IRzsSs=; b=WQgm1If/1oO0JB8dbiATTvb/gF3Lt8P4P6N5w1orln+kag3nsxWiPhl2cbu8I92tov1DfGJ0Q4bjciSbiTUJ5hvxSjseRRiTwcztb1g0iuzCINNmolVSuQEi/GZ8Q4CDZdwYpSBkMOX2vb07Qu/aB53iXWIVllYHSTD97JZI2YE= ARC-Authentication-Results: i=1; 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 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 1598547818912978.7585599425643; Thu, 27 Aug 2020 10:03:38 -0700 (PDT) Received: from localhost ([::1]:47080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLJJ-00033Q-LC for importer@patchew.org; Thu, 27 Aug 2020 13:03:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50916) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLGG-0006H1-JD for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:21131) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLGC-0005SV-Jp for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:28 -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-544-ZiiVvu8EOV-bRGREddRZZw-1; Thu, 27 Aug 2020 13:00:20 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A9BAA100A63E for ; Thu, 27 Aug 2020 17:00:18 +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 4536050B3F; Thu, 27 Aug 2020 17:00:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KF9SiR0HyK9h6SoUntBhr4RRkjYw/qK9hQ054IRzsSs=; b=Lm4Vu/FxUTf1ePSeABtginPKn0bOJ8AmrAAcjjSEBi8a0/tvNER80qt+L5/yNEU5BdFULc GyotwDMBLAS7MFHAGkQQ5KS09kW4f6NUsI/NnCNJ3qiAL8wXDGT5E/wxjHR8eivXdy0hum l2I3Q5fpAQUJJ0XsELs5R82nHABf5XE= X-MC-Unique: ZiiVvu8EOV-bRGREddRZZw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/17] configure: default to PIE disabled on Windows platforms Date: Thu, 27 Aug 2020 12:59:46 -0400 Message-Id: <20200827165956.12925-8-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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/08/27 02:54:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Daniel P. Berrang=C3=A9 If Windows EXE files are built with -pie/-fpie they will fail to launch. Historically QEMU defaulted to disabling PIE for Windows, but this setting was accidentally lost when the configure summary text was removed in commit f9332757898a764d85e19d339ec421236e885b68 Author: Paolo Bonzini Date: Mon Feb 3 13:28:38 2020 +0100 meson: move summary to meson.build Signed-off-by: Paolo Bonzini Fixes: f9332757898a764d85e19d339ec421236e885b68 Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Thomas Huth Signed-off-by: Paolo Bonzini --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index a3f95f2b22..0b78577236 100755 --- a/configure +++ b/configure @@ -857,6 +857,7 @@ MINGW32*) audio_drv_list=3D"" fi supported_os=3D"yes" + pie=3D"no" ;; GNU/kFreeBSD) bsd=3D"yes" --=20 2.26.2 From nobody Sun Nov 16 04:03:38 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1598548200; cv=none; d=zohomail.com; s=zohoarc; b=OydaiUecc9DRBZGveP+Cthz2KRyZIp45AezhuDse6mH3roIDHrsQPhddJj3/u/h3/byxJqfzjWC5qHvrlK+HjLbl6j/kxkSUrFTdTLdx1H/PtJlrx1kNPKbFtDGsm4Ss49EOy0L5BlXnSRP4leVdB8ob5JRbwt+9Zt2IU2gybvo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598548200; h=Content-Type:Content-Transfer-Encoding:Cc: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=LLIiEYtsdlTsxH0sB/z66ql8g3Hx2kUBXCfVzeQVYV8=; b=GfgQYgZ/+Il4NmlAvsbrhbMI6sKSJphIJQ77SWdeOR4CwdyF0iRNf+2h2K9f5PgXKGWI6vCpRy4OA9AuJxZgBNsFISe/4BOauvEYAOjfBoKvwJmTClwlIXvSVc0ORrErsizbGVVH6EsTEdd45Kdu1yvWsKYp4j1DYHdwHYRMJD8= ARC-Authentication-Results: i=1; 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 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 1598548200726364.32334133828533; Thu, 27 Aug 2020 10:10:00 -0700 (PDT) Received: from localhost ([::1]:43322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLPT-0004io-BS for importer@patchew.org; Thu, 27 Aug 2020 13:09:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLGE-0006B1-Cg for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:38960 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLGB-0005Qo-1r for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:26 -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-550-e2MohyvOMyS2a2DZ3iVIgw-1; Thu, 27 Aug 2020 13:00:20 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 24B8B100A8F7; Thu, 27 Aug 2020 17:00:19 +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 C60C878437; Thu, 27 Aug 2020 17:00:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LLIiEYtsdlTsxH0sB/z66ql8g3Hx2kUBXCfVzeQVYV8=; b=R8eoWlZ3k7/xv7VKotCIx7z9hsNGpClSZxjJxS1OAHiL4TNYHSIS564UAb9dOZ1IUG5Cis KthkOPNVbxJ7+isVj+h9wJyEo+wb45/jfAILLwYsvAqV0crwQvn5PYz1Yd99ccX8zC+Cvw X1iNXYRTiDcgqblo2tpBqaPWUH4z3Zw= X-MC-Unique: e2MohyvOMyS2a2DZ3iVIgw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/17] meson: move pixman detection to meson Date: Thu, 27 Aug 2020 12:59:47 -0400 Message-Id: <20200827165956.12925-9-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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_H2=-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: , Cc: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Rafael Kitover Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) When pixman is not installed (or too old), but virglrenderer is available and "configure" has been run with "--disable-system", the build currently aborts when trying to compile vhost-user-gpu (since it requires pixman). Let's skip the build of vhost-user-gpu when pixman is not installed or too old. Instead of adding CONFIG_PIXMAN, it is simpler to move the detection to pixman. Based on a patch by Thomas Huth. Fixes: 9b52b17ba5 ("configure: Allow to build tools without pixman") Reported-by: Rafael Kitover Reported-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Paolo Bonzini --- configure | 21 ++------------------- contrib/vhost-user-gpu/meson.build | 3 ++- meson.build | 13 ++++++++----- ui/meson.build | 4 +++- 4 files changed, 15 insertions(+), 26 deletions(-) diff --git a/configure b/configure index 0b78577236..9db9bb89b9 100755 --- a/configure +++ b/configure @@ -3923,20 +3923,6 @@ if test "$modules" =3D yes; then fi fi =20 -########################################## -# pixman support probe - -if test "$softmmu" =3D "no"; then - pixman_cflags=3D - pixman_libs=3D -elif $pkg_config --atleast-version=3D0.21.8 pixman-1 > /dev/null 2>&1; then - pixman_cflags=3D$($pkg_config --cflags pixman-1) - pixman_libs=3D$($pkg_config --libs pixman-1) -else - error_exit "pixman >=3D 0.21.8 not present." \ - "Please install the pixman devel package." -fi - ########################################## # libmpathpersist probe =20 @@ -6649,8 +6635,8 @@ echo_version() { fi } =20 -# prepend pixman and ftd flags after all config tests are done -QEMU_CFLAGS=3D"$pixman_cflags $fdt_cflags $QEMU_CFLAGS" +# prepend ftd flags after all config tests are done +QEMU_CFLAGS=3D"$fdt_cflags $QEMU_CFLAGS" QEMU_LDFLAGS=3D"$fdt_ldflags $QEMU_LDFLAGS" =20 config_host_mak=3D"config-host.mak" @@ -8056,9 +8042,6 @@ fi =20 done # for target in $targets =20 -echo "PIXMAN_CFLAGS=3D$pixman_cflags" >> $config_host_mak -echo "PIXMAN_LIBS=3D$pixman_libs" >> $config_host_mak - if [ "$fdt" =3D "git" ]; then subdirs=3D"$subdirs dtc" fi diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/me= son.build index 6c1459f54a..12d608c2e7 100644 --- a/contrib/vhost-user-gpu/meson.build +++ b/contrib/vhost-user-gpu/meson.build @@ -1,5 +1,6 @@ if 'CONFIG_TOOLS' in config_host and 'CONFIG_VIRGL' in config_host \ - and 'CONFIG_GBM' in config_host and 'CONFIG_LINUX' in config_host + and 'CONFIG_GBM' in config_host and 'CONFIG_LINUX' in config_host \ + and pixman.found() executable('vhost-user-gpu', files('vhost-user-gpu.c', 'virgl.c', 'vugbm= .c'), link_with: libvhost_user, dependencies: [qemuutil, pixman, gbm, virgl], diff --git a/meson.build b/meson.build index b44901dfe1..86a6d13192 100644 --- a/meson.build +++ b/meson.build @@ -113,8 +113,11 @@ if 'CONFIG_GNUTLS' in config_host gnutls =3D declare_dependency(compile_args: config_host['GNUTLS_CFLAGS']= .split(), link_args: config_host['GNUTLS_LIBS'].split(= )) endif -pixman =3D declare_dependency(compile_args: config_host['PIXMAN_CFLAGS'].s= plit(), - link_args: config_host['PIXMAN_LIBS'].split()) +pixman =3D not_found +if have_system or have_tools + pixman =3D dependency('pixman-1', required: have_system, version:'>=3D0.= 21.8', + static: enable_static) +endif pam =3D not_found if 'CONFIG_AUTH_PAM' in config_host pam =3D cc.find_library('pam') @@ -981,6 +984,7 @@ foreach target : target_dirs =20 lib =3D static_library('qemu-' + target, sources: arch_srcs + genh, + dependencies: arch_deps, objects: objects, include_directories: target_inc, c_args: c_args, @@ -1102,9 +1106,7 @@ if have_tools if 'CONFIG_VHOST_USER' in config_host subdir('contrib/libvhost-user') subdir('contrib/vhost-user-blk') - if 'CONFIG_LINUX' in config_host - subdir('contrib/vhost-user-gpu') - endif + subdir('contrib/vhost-user-gpu') subdir('contrib/vhost-user-input') subdir('contrib/vhost-user-scsi') endif @@ -1285,6 +1287,7 @@ summary_info +=3D {'SDL image support': sdl_image.fou= nd()} # TODO: add back version summary_info +=3D {'GTK support': config_host.has_key('CONFIG_GTK')} summary_info +=3D {'GTK GL support': config_host.has_key('CONFIG_GTK_GL= ')} +summary_info +=3D {'pixman': pixman.found()} # TODO: add back version summary_info +=3D {'VTE support': config_host.has_key('CONFIG_VTE')} summary_info +=3D {'TLS priority': config_host['CONFIG_TLS_PRIORITY']} diff --git a/ui/meson.build b/ui/meson.build index 018c5698bf..393c9bcb53 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -1,3 +1,6 @@ +softmmu_ss.add(pixman) +specific_ss.add(pixman) # for the include path + softmmu_ss.add(files( 'console.c', 'cursor.c', @@ -9,7 +12,6 @@ softmmu_ss.add(files( 'keymaps.c', 'qemu-pixman.c', )) -softmmu_ss.add(pixman) =20 softmmu_ss.add(when: 'CONFIG_LINUX', if_true: files('input-linux.c')) softmmu_ss.add(when: 'CONFIG_SPICE', if_true: files('spice-core.c', 'spice= -input.c', 'spice-display.c')) --=20 2.26.2 From nobody Sun Nov 16 04:03:38 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=1598548411; cv=none; d=zohomail.com; s=zohoarc; b=lOOu+d9oVKPxEYiMXS3VFXHWpa9R++C7EZym6+/gznjNki+PRH+PVtu9h6MWY97ECsaxeDueqsxFFqpXQunWKlsGpd40LXJxEIlXIgXbsIyW8eJLrWASUyLAydV8UZ+PNgeQ/89DCCVqEv99GVVHaSAn4wgqzfm/DMHo+xG7xYI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598548411; h=Content-Type:Content-Transfer-Encoding:Cc: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=0GIS4sJrpYwSxVl4OBe0grTnM0NESHgzmK3QC9d6C6k=; b=HjcgsaKAEUSnifgGmridQY2xhLIreZX7kEG6sZyoRn3RV8NGjlC8h92ZdA+WQTpX1PtFnXmWSVjdp1qkBoqaTs7DfL2vqLhuL5idgY7mzp/100AAv9PM/eh3/ATh2aBk8JvkR2zSCtoYj5FgQ9h/tRC/gB+Q4yG4OqYq4vGFUgU= 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 1598548411620556.3345432183828; Thu, 27 Aug 2020 10:13:31 -0700 (PDT) Received: from localhost ([::1]:55738 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLSs-0001SI-8I for importer@patchew.org; Thu, 27 Aug 2020 13:13:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLGF-0006EU-Dh for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:27 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21514 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLGB-0005R0-3K for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:27 -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-558-9hIK1qE8PH2DAu-RBAoawg-1; Thu, 27 Aug 2020 13:00:20 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 92F09800683; Thu, 27 Aug 2020 17:00:19 +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 3FD7D50B3F; Thu, 27 Aug 2020 17:00:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0GIS4sJrpYwSxVl4OBe0grTnM0NESHgzmK3QC9d6C6k=; b=Ihjjv1xsq17BaQfXHVO19xff2aFUtBGlU71omy3UwaJ4j1JA/cBt9l4N0MixzQbAn/6XFt 8k0d1jYIdL1a+9bMzId6gdZxyg3/yyBaLbhp5IDoJ2LmQah9qrTlpTQfxm6PZLzENCeNVu 2xafNXzTrUh3v4JjN6p3AI6z838llsE= X-MC-Unique: 9hIK1qE8PH2DAu-RBAoawg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 09/17] meson: skip SDL2 detection if --disable-system Date: Thu, 27 Aug 2020 12:59:48 -0400 Message-Id: <20200827165956.12925-10-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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_H2=-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: , Cc: Peter Maydell 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" SDL is only used for system emulation; avoid spurious warnings for static --disable-system emulation by skipping the detection of the library if there are no system emulation targets. Reported-by: Peter Maydell Signed-off-by: Paolo Bonzini --- meson.build | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build index 86a6d13192..a3baa2dbf0 100644 --- a/meson.build +++ b/meson.build @@ -20,6 +20,16 @@ build_docs =3D 'BUILD_DOCS' in config_host config_host_data =3D configuration_data() genh =3D [] =20 +target_dirs =3D config_host['TARGET_DIRS'].split() +have_user =3D false +have_system =3D false +foreach target : target_dirs + have_user =3D have_user or target.endswith('-user') + have_system =3D have_system or target.endswith('-softmmu') +endforeach +have_tools =3D 'CONFIG_TOOLS' in config_host +have_block =3D have_system or have_tools + add_project_arguments(config_host['QEMU_CFLAGS'].split(), native: false, language: ['c', 'objc']) add_project_arguments(config_host['QEMU_CXXFLAGS'].split(), @@ -227,9 +237,12 @@ if 'CONFIG_BRLAPI' in config_host brlapi =3D declare_dependency(link_args: config_host['BRLAPI_LIBS'].spli= t()) endif =20 -sdl =3D dependency('sdl2', required: get_option('sdl'), static: enable_sta= tic, - include_type: 'system') -sdl_image =3D not_found +sdl =3D not_found +if have_system + sdl =3D dependency('sdl2', required: get_option('sdl'), static: enable_s= tatic, + include_type: 'system') + sdl_image =3D not_found +endif if sdl.found() # work around 2.0.8 bug sdl =3D declare_dependency(compile_args: '-Wno-undef', @@ -426,9 +439,6 @@ endforeach genh +=3D configure_file(output: 'config-host.h', configuration: config_ho= st_data) =20 minikconf =3D find_program('scripts/minikconf.py') -target_dirs =3D config_host['TARGET_DIRS'].split() -have_user =3D false -have_system =3D false config_devices_mak_list =3D [] config_devices_h =3D {} config_target_h =3D {} @@ -449,7 +459,6 @@ kconfig_external_symbols =3D [ ] ignored =3D ['TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_DIRS'] foreach target : target_dirs - have_user =3D have_user or target.endswith('-user') config_target =3D keyval.load(meson.current_build_dir() / target / 'conf= ig-target.mak') =20 config_target_data =3D configuration_data() @@ -472,8 +481,6 @@ foreach target : target_dirs configuration: config_targe= t_data)} =20 if target.endswith('-softmmu') - have_system =3D true - base_kconfig =3D [] foreach sym : kconfig_external_symbols if sym in config_target or sym in config_host @@ -503,8 +510,6 @@ foreach target : target_dirs endif config_target_mak +=3D {target: config_target} endforeach -have_tools =3D 'CONFIG_TOOLS' in config_host -have_block =3D have_system or have_tools =20 grepy =3D find_program('scripts/grepy.sh') # This configuration is used to build files that are shared by --=20 2.26.2 From nobody Sun Nov 16 04:03:38 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=1598548302; cv=none; d=zohomail.com; s=zohoarc; b=Bqw88p3ihELO9vlHGfiMbom0MyvH0GOxyVI6diWPYrVbaUso0rl9j87Zq6ok+oHE0HxerTwUw3VcX4FvSt4rjjQc3v8M+xJeEPHgxTCgU08WzahRzXrLLKwbPBE2HOsZ0pSOlI/0Vej+c7m8Vi8HLFAIxJzKXkdrL54CS8hI3lk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598548302; h=Content-Type:Content-Transfer-Encoding:Cc: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=QAL+xb8Z8Q1fT1MGAGd3DM6glV+qy904a5V+tZdfuAs=; b=IyT4DRAze9a+J/o09wset759ZLDisDupyo3cZM7GwEMJa+5lIScfrpvJTHVEalMel8HrSSK9OAzg8I9GlQAEoKnKjFPRFmWK8psoscM6TZ2qgwzGMWeFcBpyBxWh6hqgh5/udb8r/RjdxV5mUoRtn44Nl9y0IWe/Bh3+hSsh3T0= 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 1598548302117456.1534934765423; Thu, 27 Aug 2020 10:11:42 -0700 (PDT) Received: from localhost ([::1]:49412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLR6-0007HL-Ty for importer@patchew.org; Thu, 27 Aug 2020 13:11:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLGF-0006D8-5T for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:27 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:21364 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLGB-0005Re-LJ for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:26 -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-208-j1CUipB1Oc-O7qnTO8ncmg-1; Thu, 27 Aug 2020 13:00:21 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 70D53801AAF; Thu, 27 Aug 2020 17:00:20 +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 2E6CA50B3F; Thu, 27 Aug 2020 17:00:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QAL+xb8Z8Q1fT1MGAGd3DM6glV+qy904a5V+tZdfuAs=; b=HJY2IuaX/NDS78r1cyB4oHwtW+YFsdGvvMdvfWO9BnB6KCsJ54m15Cf569wa9afGBNT6B1 IItVFb0VruoidGlLI9NhFz801eKnR14Eo2H3Xq+bXT50Ilsq+SdjExscqo6ejx2NMLHsad Jteru4a131Xkhpg8ENtbm2xatHOiZGU= X-MC-Unique: j1CUipB1Oc-O7qnTO8ncmg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/17] configure: add --ninja option Date: Thu, 27 Aug 2020 12:59:49 -0400 Message-Id: <20200827165956.12925-11-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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_H2=-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: , Cc: Mark Cave-Ayland 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" On Windows it is not possible to invoke a Python script as $NINJA. If ninja is present use it directly, while if it is not we can keep using ninjatool. Reported-by: Mark Cave-Ayland Signed-off-by: Paolo Bonzini --- configure | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 9db9bb89b9..6ecaff429b 100755 --- a/configure +++ b/configure @@ -568,6 +568,7 @@ rng_none=3D"no" secret_keyring=3D"" libdaxctl=3D"" meson=3D"" +ninja=3D"" skip_meson=3Dno gettext=3D"" =20 @@ -1052,6 +1053,8 @@ for opt do ;; --meson=3D*) meson=3D"$optarg" ;; + --ninja=3D*) ninja=3D"$optarg" + ;; --smbd=3D*) smbd=3D"$optarg" ;; --extra-cflags=3D*) @@ -1820,6 +1823,7 @@ Advanced options (experts only): --python=3DPYTHON use specified python [$python] --sphinx-build=3DSPHINX use specified sphinx-build [$sphinx_build] --meson=3DMESON use specified meson [$meson] + --ninja=3DNINJA use specified ninja [$ninja] --smbd=3DSMBD use specified smbd [$smbd] --with-git=3DGIT use specified git [$git] --static enable static build [$static] @@ -2058,6 +2062,16 @@ case "$meson" in *) meson=3D$(command -v meson) ;; esac =20 +# Probe for ninja (used for compdb) + +if test -z "$ninja"; then + for c in ninja ninja-build samu; do + if has $c; then + ninja=3D$(command -v "$c") + break + fi + done +fi =20 # Check that the C compiler works. Doing this here before testing # the host CPU ensures that we had a valid CC to autodetect the @@ -8197,7 +8211,7 @@ fi mv $cross config-meson.cross =20 rm -rf meson-private meson-info meson-logs -NINJA=3D$PWD/ninjatool $meson setup \ +NINJA=3D${ninja:-$PWD/ninjatool} $meson setup \ --prefix "${pre_prefix}$prefix" \ --libdir "${pre_prefix}$libdir" \ --libexecdir "${pre_prefix}$libexecdir" \ --=20 2.26.2 From nobody Sun Nov 16 04:03:38 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=1598547733; cv=none; d=zohomail.com; s=zohoarc; b=gaiVL1HWJ5S2avMt9bhEHQtYDKJS7r+3UyzSU00g9v9nJXrBAJlNZfubcWaudvevoQx6uLqk7bfOC0DPPTVIOlWzOqGRvGLTiHeoqPpT9jfBfEPe359oMTnkxkOktATX/E3nY+b7L7XvraCwH9ObBZYgFRGMP8kz8lapp0MYP20= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598547733; 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=GguCrW/Rvun9IpqZXGcfmt+z0BdPZspMP0K0b8YELQg=; b=FHQ4hyen+YB8DIPGA/HR0ANIBeOYok8wLQIOTp4iZ09W8XG3lZ8/AwwaRrmd9tTqeozcuFL2jrDB2e+4i5tMFfB5YDtrIEA7VFWrCjHiYAs2fnlXl1XOV+fYtrIjn6wgmcJvdibNRCjQE8PkEmMXU+ycBTFi5xAL9qt3DKe4WdQ= 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 1598547733629821.8613986052613; Thu, 27 Aug 2020 10:02:13 -0700 (PDT) Received: from localhost ([::1]:38664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLHw-00084f-6m for importer@patchew.org; Thu, 27 Aug 2020 13:02:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLGG-0006GR-AR for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:28 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:56609 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLGD-0005TN-Em for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:27 -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-274-THLtucD3MKuXvRA2v8x4sg-1; Thu, 27 Aug 2020 13:00:21 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C1CCC189E617 for ; Thu, 27 Aug 2020 17:00:20 +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 8D03550B3F for ; Thu, 27 Aug 2020 17:00:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547624; 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=GguCrW/Rvun9IpqZXGcfmt+z0BdPZspMP0K0b8YELQg=; b=jR4HWqPABKc+JrpXA2pevEC/E4jGGRuBpIiUUKnfWuK4Yrz06Swk08heoB1VnJ8aw6/vu5 7cX9ZVIlvc+TiFWhDmH/8h59e5DaCA/ivrHCqporOXKA7vQQBhaucqSGdoGr6/tfHYEKQx 9vyRIFwY5nbaPaxMtUx+XrKa/t17UQs= X-MC-Unique: THLtucD3MKuXvRA2v8x4sg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 11/17] meson: cleanup xkbcommon detection Date: Thu, 27 Aug 2020 12:59:50 -0400 Message-Id: <20200827165956.12925-12-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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_H2=-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" Signed-off-by: Paolo Bonzini --- meson.build | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index a3baa2dbf0..90128616e5 100644 --- a/meson.build +++ b/meson.build @@ -165,10 +165,11 @@ libcap_ng =3D not_found if 'CONFIG_LIBCAP_NG' in config_host libcap_ng =3D declare_dependency(link_args: config_host['LIBCAP_NG_LIBS'= ].split()) endif -xkbcommon =3D dependency('xkbcommon', required: get_option('xkbcommon'), s= tatic: enable_static, - include_type: 'system') -if xkbcommon.found() - xkbcommon =3D declare_dependency(dependencies: xkbcommon) +if get_option('xkbcommon').auto() and not have_system and not have_tools + xkbcommon =3D not_found +else + xkbcommon =3D dependency('xkbcommon', required: get_option('xkbcommon'), + static: enable_static) endif slirp =3D not_found if config_host.has_key('CONFIG_SLIRP') @@ -1078,9 +1079,6 @@ endif =20 # Don't build qemu-keymap if xkbcommon is not explicitly enabled # when we don't build tools or system -if get_option('xkbcommon').auto() and not have_system and not have_tools - xkbcommon =3D not_found -endif if xkbcommon.found() # used for the update-keymaps target, so include rules even if !have_too= ls qemu_keymap =3D executable('qemu-keymap', files('qemu-keymap.c', 'ui/inp= ut-keymap.c') + genh, --=20 2.26.2 From nobody Sun Nov 16 04:03:38 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=1598547834; cv=none; d=zohomail.com; s=zohoarc; b=K7EnhcVMpP99O9WAwqg7SjT1ZUrKx+6HTX8YQX2bZvmJ19EJh+xhdGpYpuYoHNnJn4hSxBEIXE8NUzeiBV+WPj3TeUrvJT8HeR0BJv5rd8962gODbMjsrsLuJq+LWaGlBQKbWT8FyTP+RLDLgnJ3D37Dt9qczTeJtM7ablq5D/Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598547834; h=Content-Type:Content-Transfer-Encoding:Cc: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=l0qmoXzyoO5mCYonXFyvhU+th08hnMEw8zFrlRa0/JM=; b=D3LVlh0yrY6eNXufQmJe2URQy8WrTtxY/ZZ5jDxa9n04HEWPk9SlVgb9WybZqNuRB47RPt9Jjv3/XT4UVd0JGoY+fNP4GOxSKo9eqatoErt7ESakBtBJCYLn32F+VDmHJ6ELEhvM+7KfIX8+w7LkIoQHvk39KLQzlvODdnoHTb4= 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 1598547834278670.7863950090317; Thu, 27 Aug 2020 10:03:54 -0700 (PDT) Received: from localhost ([::1]:48656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLJY-0003iB-Vo for importer@patchew.org; Thu, 27 Aug 2020 13:03:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51006) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLGT-0006O3-ON for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:48370) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLGL-0005X1-PY for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:41 -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-329-Qtw_rmzwNUSniOhfvyQ6gg-1; Thu, 27 Aug 2020 13:00:25 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E9F2F107464C; Thu, 27 Aug 2020 17:00:23 +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 DDDAD50B3F; Thu, 27 Aug 2020 17:00:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=l0qmoXzyoO5mCYonXFyvhU+th08hnMEw8zFrlRa0/JM=; b=J0LKyJHfxkgUk+5wtFCNUzckGmz7Gphv4n85g9bEsT+A/HE+cWQIJMBoNX9SirGTmz7tKB JYvM+Cj/FevVRRoMWbstJ8DMj2Aqazc1IdOBEWOEe4vLwjw8kA70MhnyCiEAc4iwoWICOf d3kTPt5gxJz+MtUScSth2ojyXYGGwDc= X-MC-Unique: Qtw_rmzwNUSniOhfvyQ6gg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/17] meson: don't require CONFIG_VTE for the GTK UI Date: Thu, 27 Aug 2020 12:59:51 -0400 Message-Id: <20200827165956.12925-13-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.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/08/27 02:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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: , Cc: Mark Cave-Ayland , Gerd Hoffmann 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" From: Mark Cave-Ayland Prevously CONFIG_VTE was not required to build QEMU with GTK UI support as = not all platforms have VTE available (in particular Windows). Remove this requirement from the meson build system to enable QEMU to be bu= ilt with GTK UI support for Windows once again. Signed-off-by: Mark Cave-Ayland Reviewed-by: Gerd Hoffmann Signed-off-by: Paolo Bonzini --- ui/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/meson.build b/ui/meson.build index 393c9bcb53..962e776569 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -44,7 +44,7 @@ if config_host.has_key('CONFIG_CURSES') ui_modules +=3D {'curses' : curses_ss} endif =20 -if config_host.has_key('CONFIG_GTK') and config_host.has_key('CONFIG_VTE') +if config_host.has_key('CONFIG_GTK') softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('win32-kbd-hook.c')) =20 gtk_ss =3D ss.source_set() --=20 2.26.2 From nobody Sun Nov 16 04:03:38 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=1598547911; cv=none; d=zohomail.com; s=zohoarc; b=C5wajgQ1cQ8+q+Fp2vvotNrRZWYm81PJerTSSDGlgggNxInWVDA7S+1KtVX65115YI8UVyCE6S/j8b2ggLwMtKeqhGRiBXK1X+EGdPjPgWGUhXgDJst70394iM7Kiyck+OieXg1E0HNy9O85qMwrd9LFEhp0tcK/QP+VoGrKnqQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598547911; h=Content-Type:Content-Transfer-Encoding:Cc: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=yEDf+p/ADTtLKkCVxqoCqYGwvr2LwjZU9msIj0OQM8c=; b=DGkKXkzPaw8NuzHb678ZKl730/KOxbeAXRJFsb7RZFBj8dglL6U4RGWwtvW9IVVy5GbSo1AXYq4/vwseBMntkPKT1RqK+gdRzGgAbeLAexT3g+WyHbxRHnRyhyretIXRBx4wpx1xu+dm1ZkASgH7J7DscCo4/M9OgS7Lt8ZRfZ4= 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 159854791108043.59834251160737; Thu, 27 Aug 2020 10:05:11 -0700 (PDT) Received: from localhost ([::1]:55420 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLKn-0006QL-OZ for importer@patchew.org; Thu, 27 Aug 2020 13:05:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLGM-0006Lq-Vj for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:35 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:25508 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLGI-0005WK-3P for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:34 -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-458-EFkmmfzsMryAWNIsFmaSXg-1; Thu, 27 Aug 2020 13:00:26 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 45C16425EB for ; Thu, 27 Aug 2020 17:00:25 +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 10F0E50B3F; Thu, 27 Aug 2020 17:00:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547628; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yEDf+p/ADTtLKkCVxqoCqYGwvr2LwjZU9msIj0OQM8c=; b=T9KkDZD+VY0gY18nf9u3oTR30/8XoG72ySma5SPhhkjmom6sx4zX86Yk4kcyI6sIGq9iG3 XkjUzidH0jFjmfVcn+mKThS15aPS/0lfMKnA4e3AzM//4bRDZWWaxLmVfJMxa8P/gyw8ir VG4P+eqHGeqtC9lq3QqTx7kWTavVRNA= X-MC-Unique: EFkmmfzsMryAWNIsFmaSXg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 13/17] ninjatool: quote dollars in variables Date: Thu, 27 Aug 2020 12:59:52 -0400 Message-Id: <20200827165956.12925-14-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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=205.139.110.61; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 07:16:16 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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_H3=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: , Cc: Laurent Vivier 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" Otherwise, dollars (such as in the special $ORIGIN rpath) are eaten by Make. Reported-by: Laurent Vivier Signed-off-by: Paolo Bonzini --- scripts/ninjatool.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/ninjatool.py b/scripts/ninjatool.py index cc77d51aa8..c33eafb5a0 100755 --- a/scripts/ninjatool.py +++ b/scripts/ninjatool.py @@ -834,7 +834,8 @@ class Ninja2Make(NinjaParserEventsWithVars): self.print() for targets in self.build_vars: for name, value in self.build_vars[targets].items(): - self.print('%s: private .var.%s :=3D %s' % (targets, name,= value)) + self.print('%s: private .var.%s :=3D %s' % + (targets, name, value.replace('$', '$$'))) self.print() if not self.seen_default: default_targets =3D sorted(self.all_outs - self.all_ins, key= =3Dnatural_sort_key) --=20 2.26.2 From nobody Sun Nov 16 04:03:38 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=1598548020; cv=none; d=zohomail.com; s=zohoarc; b=ZFI7OD6UN6n7oBYP0Aykhb2peB0sPe15K0+1NyqdZRAmxeEGbRGrnWL6/HYIJI0y9/ylyWIHI9w0buJp3E1N+OTq0wOCfaGJuZlJ+jHs5XjTp40rTr8lzRZtQEsGdbFowOJ6UulFE3lX5xG5eM3EOupEicfGBqTGnoWluTOXSes= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598548020; h=Content-Type:Content-Transfer-Encoding:Cc: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=Aki3Qo0pxFtN0AobNIq1SGsWqCNa8JRiNsFzMRNgv5Q=; b=dc4EYpPBSMM2nPHjIGLD1v8LEm2BmDSmSf4hORzu7ZDXs2fqsMoEOAwGdh9rJpd+c9e8F0D8yguHjIHGocatvKfkgZDSt+MJLJbmLcs+U4DOR5HeT6K8jP+5OfMIXDEnbuWWN04iE42o5D/qPICMJLyWB0LdJZirUt32bzi8mkY= 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 1598548020194738.9321203421616; Thu, 27 Aug 2020 10:07:00 -0700 (PDT) Received: from localhost ([::1]:33534 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLMZ-0000gr-0Z for importer@patchew.org; Thu, 27 Aug 2020 13:06:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51000) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLGP-0006Ne-Od for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:41 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:36717 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLGK-0005Ww-4R for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:37 -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-246-6rX5rXYhOVyEDN3gwKNiAQ-1; Thu, 27 Aug 2020 13:00:26 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id AB0C2107464F; Thu, 27 Aug 2020 17:00:25 +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 60BAB50B3F; Thu, 27 Aug 2020 17:00:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547630; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Aki3Qo0pxFtN0AobNIq1SGsWqCNa8JRiNsFzMRNgv5Q=; b=UKstlpaX1z3nkNan7dwV9Rc+CUfuM4HO7nZG5AcncY3x9BTP5QR2OfrdcAb/sp4uoPrAdp uC4y2ySthVmCoksx90Qy3QpEK3c6C4zDC4IZ45HESnAevO1a/ja8NzX9fs0yfs6p/1dErg LkurPA15fS23t3U3ZCPEP9xtq0imQ/M= X-MC-Unique: 6rX5rXYhOVyEDN3gwKNiAQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/17] meson: fix relpath failure on Win32 Date: Thu, 27 Aug 2020 12:59:53 -0400 Message-Id: <20200827165956.12925-15-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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_H2=-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: , Cc: Yonggang Luo 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" From: Yonggang Luo On win32, os.path.relpath can raise an exception when computing for example C:/msys64/mingw64/x.exe relative to E:/path/qemu-build. Use try...except to avoid this, just using an absolute path in this case. Signed-off-by: Yonggang Luo Signed-off-by: Paolo Bonzini --- scripts/mtest2make.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/mtest2make.py b/scripts/mtest2make.py index bdb257bbd9..d7a51bf97e 100644 --- a/scripts/mtest2make.py +++ b/scripts/mtest2make.py @@ -53,9 +53,16 @@ i =3D 0 for test in json.load(sys.stdin): env =3D ' '.join(('%s=3D%s' % (shlex.quote(k), shlex.quote(v)) for k, v in test['env'].items())) - executable =3D os.path.relpath(test['cmd'][0]) + executable =3D test['cmd'][0] + try: + executable =3D os.path.relpath(executable) + except: + pass if test['workdir'] is not None: - test['cmd'][0] =3D os.path.relpath(test['cmd'][0], test['workdir']) + try: + test['cmd'][0] =3D os.path.relpath(executable, test['workdir']) + except: + test['cmd'][0] =3D executable else: test['cmd'][0] =3D executable cmd =3D '$(.test.env) %s %s' % (env, ' '.join((shlex.quote(x) for x in= test['cmd']))) --=20 2.26.2 From nobody Sun Nov 16 04:03:38 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=1598547928; cv=none; d=zohomail.com; s=zohoarc; b=dNQ3xtzOFrtLTwbAZG9EHxLak5BSwhX1ePHJcCaLJ8ZDQsZnmo39UjUAYToDqZhwsckDRXQIx1mQG7YHLjegvkqLFSS0YyZxO6LRdsxq17S0XLD3BKganbbhws7jCHbHMoOhQfijA8DfNhR/TGN/eC54W6dzsZCfT2j7lbDDbAw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598547928; h=Content-Type:Content-Transfer-Encoding:Cc: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=7Vs2IR82N5yv5+O8LET0LR5jMfZ9BX8w4Zn0vnDM/Ww=; b=TJT4bguCdLxGAZMfTRVX8g259gi9eyA923G/cJRxoi1Vuzo3VlffRDAJlrOaByIyjRH4jFLyohCfPqTzqQyxuO40ldN+ICxOzwFRELLlelR48J0UxT674p7QbyvYGdHWFhvj7UMyGQ2Ao/Q6pHFlmeSRj1kxNfIf6pHiSC+ytLE= 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 1598547928519353.61683517154427; Thu, 27 Aug 2020 10:05:28 -0700 (PDT) Received: from localhost ([::1]:57050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLL4-00075E-8d for importer@patchew.org; Thu, 27 Aug 2020 13:05:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51008) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLGU-0006Os-1H for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:21334) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLGM-0005X7-Ky for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:41 -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-371-QDGXTPGgNZ-qnsK-LMbZSg-1; Thu, 27 Aug 2020 13:00:28 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1434C425D7; Thu, 27 Aug 2020 17:00:26 +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 C5E2E50B3F; Thu, 27 Aug 2020 17:00:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7Vs2IR82N5yv5+O8LET0LR5jMfZ9BX8w4Zn0vnDM/Ww=; b=caRV15NeMahbAQXDa9XdC10jYJoe/nqGIE7/KNowfKzc3eRDysJCyFDZzlXAVN/DfoUsLF MVIonBciZx6e8XFDwN2dt2IP4LCJ29bXjFo4BWnR5e/q78uIUvOsz5n/QcResWximKSHde eaC9nZ1rxpRYxUFn/OTS99WNjdNIOns= X-MC-Unique: QDGXTPGgNZ-qnsK-LMbZSg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 15/17] meson: Mingw64 gcc doesn't recognize system include_type for sdl2 Date: Thu, 27 Aug 2020 12:59:54 -0400 Message-Id: <20200827165956.12925-16-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.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/08/27 02:10:07 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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: , Cc: Yonggang Luo 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" From: Yonggang Luo Windows paths result in command lines like "-isystemC:/msys64/..." that are not recognized by GCC. "include_type: 'system'" was only included in an attempt to fix the -Wundef warnings in SDL 2.0.8, but it was not effective. Therefore we can fix this by remove the include_type. Signed-off-by: Yonggang Luo Signed-off-by: Paolo Bonzini --- meson.build | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 90128616e5..e6aa44be54 100644 --- a/meson.build +++ b/meson.build @@ -240,8 +240,7 @@ endif =20 sdl =3D not_found if have_system - sdl =3D dependency('sdl2', required: get_option('sdl'), static: enable_s= tatic, - include_type: 'system') + sdl =3D dependency('sdl2', required: get_option('sdl'), static: enable_s= tatic) sdl_image =3D not_found endif if sdl.found() --=20 2.26.2 From nobody Sun Nov 16 04:03:38 2025 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 ARC-Seal: i=1; a=rsa-sha256; t=1598548125; cv=none; d=zohomail.com; s=zohoarc; b=QOOpMnSKistgQRj2c2wF/Xncq8rcFidcXRc00d5RCqx9UsiyNED3UNnkeliZ1DOFSdHoIsUqkRR3qI0MOIvbrdw7C/JcykcGnEws6xq48fzetIySf4Fn+JqHaEk254glCzdqHcpPi7sdm6BSPmGR/flzmQ+iyjfcmd07cwMr6Y8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598548125; h=Content-Type:Content-Transfer-Encoding:Cc: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=tIJ9aMXUP8mCemFV8TF6Z07N+X778UQaO0mWF3aAZ8Q=; b=WGXP14aNLFL/0rmmTPgppeA2BqgLC+2tnC0RiOgU2rzHE3cd7gTZv1lnpfR7Ju0bDDwXPpg+X+BfUD+utEDflpHDz5O77ZTBLLgn4ZawzUTIBXdagMxpycOR+17BG/EpxzRcZcQfFBazKK73u+Iow+wTbLLcVCd6KrW98zUQPrM= ARC-Authentication-Results: i=1; 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 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 1598548125215373.6572264010973; Thu, 27 Aug 2020 10:08:45 -0700 (PDT) Received: from localhost ([::1]:39184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLOF-00030e-R2 for importer@patchew.org; Thu, 27 Aug 2020 13:08:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51002) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLGP-0006Nf-UM for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:26420) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLGM-0005XE-Lq for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:37 -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-258-JkPDR0rDPwq0Db3QKNO1-A-1; Thu, 27 Aug 2020 13:00:31 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 874C1107464D for ; Thu, 27 Aug 2020 17:00:30 +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 2FC187842B; Thu, 27 Aug 2020 17:00:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tIJ9aMXUP8mCemFV8TF6Z07N+X778UQaO0mWF3aAZ8Q=; b=ZgTM7Y03Sd3wjV1H7du3/jcG07vXSk+5dixbX4CODEsiYSqBbelVwU5NxVidw2UhP1JGis 9UcxRzMnrwA/NA8lYHYeLpEHyXcoc7v/7C015anoQEsBAi1Oa9EXMYuWKkHpMZLruEKGXE 3Pw61/WH8k6OkwS9OkkNyStRZBziRSA= X-MC-Unique: JkPDR0rDPwq0Db3QKNO1-A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 16/17] meson: set colorout to auto Date: Thu, 27 Aug 2020 12:59:55 -0400 Message-Id: <20200827165956.12925-17-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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/08/27 02:54:02 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Gerd Hoffmann Dunno why the default is set to "always". IMHO it should be "auto", i.e. only colorize in case stdout goes to a terminal. Cluttering logfiles and confusing compiler message parsers with terminal control sequences is not nice ... Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- meson.build | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index e6aa44be54..74f8ea0c2e 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,6 @@ project('qemu', ['c'], meson_version: '>=3D0.55.0', - default_options: ['warning_level=3D1', 'c_std=3Dgnu99', 'cpp_std= =3Dgnu++11', 'b_lundef=3Dfalse'], + default_options: ['warning_level=3D1', 'c_std=3Dgnu99', 'cpp_std= =3Dgnu++11', + 'b_lundef=3Dfalse','b_colorout=3Dauto'], version: run_command('head', meson.source_root() / 'VERSION').stdo= ut().strip()) =20 not_found =3D dependency('', required: false) --=20 2.26.2 From nobody Sun Nov 16 04:03:39 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=1598548218; cv=none; d=zohomail.com; s=zohoarc; b=KLGOMnufT86r5rPDXpSPyFcJ12r6qI/HzmkGef+RnfDij42LSMisIgErkt4hre1QdadviBg8BxHCsCxUe2cL9vCxPUVDU/p76A+diw0bdetPeobbOx1cyOdm6s96foe58RRPZVOqpv2F9KB8KAKH/mlRs44fuGXXYEj29j8h1P4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598548218; h=Content-Type:Content-Transfer-Encoding:Cc: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=g2BikqXo84AfVukVb99AX96rxHu5kZvtkiKlzCjSB9k=; b=DvtJh8lLd1NLCMY403gInhVjp0BfPBt4DS0k4DbeT451yYIUEMDC4mLPsAALH56YNK+PpKiNPR9gt1GkfEx6L4zNEvf4Q7v2CzLxOh3iufzkspEYaK8k4S1Q+6Xs6mYWORJAv3IfoWWMHvDXl5kMk0L68S8WFSc8gLUCRf+y8wU= 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 1598548218964330.0764144139406; Thu, 27 Aug 2020 10:10:18 -0700 (PDT) Received: from localhost ([::1]:44094 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kBLPl-00051v-Mt for importer@patchew.org; Thu, 27 Aug 2020 13:10:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51004) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kBLGT-0006Nw-Oe for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:41 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:53451 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kBLGN-0005XK-2l for qemu-devel@nongnu.org; Thu, 27 Aug 2020 13:00:37 -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-298-Rkkx2IusNPmr8RmyuKjieg-1; Thu, 27 Aug 2020 13:00:32 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 03412425D3; Thu, 27 Aug 2020 17:00:31 +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 A31BA78426; Thu, 27 Aug 2020 17:00:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598547634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=g2BikqXo84AfVukVb99AX96rxHu5kZvtkiKlzCjSB9k=; b=EdXh+sohi+INfZAYFzSy2ElVtXhINih6gK8LpGH9VkdPbGvs/r5Lehq1ElFnHwvYHntnv3 4AUF2WuqFPu5gNf4J8kwON4u/DsMIn5XAdGH4Hrs+VJfpKyeII9Yje8w/K0FBbi3Edy0mP 4Hu1ivYixhtIrbTMkzKM8ZggLFRMXGs= X-MC-Unique: Rkkx2IusNPmr8RmyuKjieg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 17/17] ninjatool: Fixes E$$: in generated Makefile.ninja Date: Thu, 27 Aug 2020 12:59:56 -0400 Message-Id: <20200827165956.12925-18-pbonzini@redhat.com> In-Reply-To: <20200827165956.12925-1-pbonzini@redhat.com> References: <20200827165956.12925-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.001 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=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/27 00:13:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.959, 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_H2=-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: , Cc: Yonggang Luo , Mark Cave-Ayland 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" From: Yonggang Luo Even though SIMPLE_PATH_RE is used with re.match (which anchors the match implictly to the beginning of the string) it also needs an end-of-string anchor in order to match the full path token. Otherwise, the match would succeed incorrectly for $ and : characters contained in the path, for example if the path starts with C:/ or E:/. Signed-off-by: Yonggang Luo Tested-by: Mark Cave-Ayland Signed-off-by: Paolo Bonzini --- scripts/ninjatool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ninjatool.py b/scripts/ninjatool.py index c33eafb5a0..ba6bd9a2a6 100755 --- a/scripts/ninjatool.py +++ b/scripts/ninjatool.py @@ -55,7 +55,7 @@ else: =20 PATH_RE =3D r"[^$\s:|]+|\$[$ :]|\$[a-zA-Z0-9_-]+|\$\{[a-zA-Z0-9_.-]+\}" =20 -SIMPLE_PATH_RE =3D re.compile(r"[^$\s:|]+") +SIMPLE_PATH_RE =3D re.compile(r"^[^$\s:|]+$") IDENT_RE =3D re.compile(r"[a-zA-Z0-9_.-]+$") STRING_RE =3D re.compile(r"(" + PATH_RE + r"|[\s:|])(?:\r?\n)?|.") TOPLEVEL_RE =3D re.compile(r"([=3D:#]|\|\|?|^ +|(?:" + PATH_RE + r")+)\s*|= .") --=20 2.26.2