From nobody Sat Feb 7 04:26:48 2026 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=1598951555; cv=none; d=zohomail.com; s=zohoarc; b=VRGr86HbS+AvslKKP/UP8y8a3vZNsVUqfLxJPcGJr9SmgowSRtEmH4E17GgCwmAi3KmVxaHBYpSN4Gxg2kWSIMU24dVwrRM+UMFL8Hr9HHKNmM/BWwiUnESqmJnMPYkeq4cP1W8ZrMplRitWU+iyMwv47wyYVEueFvEHhbq1f1k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598951555; 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=kd76zrZSBhrtrv9l40KcQRV9zyPxef8ChsdSAadfHeU=; b=MmNaAK2Iw+QmoY6lJiT/DAmsC6CcEALFqXYmKwFA6ieKGJ5QDwxyH7t1DkAdXBXMCOndlXfrAdy/rQTOaYlnUR45PvTAZ1iJz/icSYfmB6HmOiA1q09vKKbV/xBC4gPAXocCJqS/jvN7MIFI80LLp/FcjCilNuYBifwGAdDCVGE= 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 1598951555715654.3873804511845; Tue, 1 Sep 2020 02:12:35 -0700 (PDT) Received: from localhost ([::1]:50556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2LB-0004gT-Mv for importer@patchew.org; Tue, 01 Sep 2020 05:12:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33520) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KI-0003B8-Hw for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:55496) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD2KG-0006oa-GH for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:38 -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-244-kMWK6rDzOoieqvg_c8nqFA-1; Tue, 01 Sep 2020 05:11:34 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5E3991074641 for ; Tue, 1 Sep 2020 09:11:33 +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 1C51160C04; Tue, 1 Sep 2020 09:11:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951495; 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=kd76zrZSBhrtrv9l40KcQRV9zyPxef8ChsdSAadfHeU=; b=f8XVGEOlhikMG5r7aw+hg3VfQN5xqtKGQVHQKaZr/RgkBXlTgIq4bMIIPOC2SQqaP5yqxT 9pxSJ6m6lGjVLR7+40sEJW9cnV5T4Dl4lL6q/JKJ7eejiCQa8U1/bdE4LK+YAlVjU9KExa zMhEPF+a7Nb/asVtme/NZNBOVychn3w= X-MC-Unique: kMWK6rDzOoieqvg_c8nqFA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 01/24] meson: bump submodule to 0.55.1 Date: Tue, 1 Sep 2020 05:11:09 -0400 Message-Id: <20200901091132.29601-2-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=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/31 23:17:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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" This version includes an important bugfix to avoid including unnecessary -Wl,-rpath flags. It also avoids the warnings on custom_targets with more than one output. Reported-by: Laurent Vivier Reviewed-by: Laurent Vivier Tested-by: Laurent Vivier Signed-off-by: Paolo Bonzini --- configure | 2 +- meson | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 8dc981684b..f81900880a 100755 --- a/configure +++ b/configure @@ -2023,7 +2023,7 @@ python_version=3D$($python -c 'import sys; print("%d.= %d.%d" % (sys.version_info[0] python=3D"$python -B" =20 if test -z "$meson"; then - if test "$explicit_python" =3D no && has meson && version_ge "$(meson = --version)" 0.55.0; then + if test "$explicit_python" =3D no && has meson && version_ge "$(meson = --version)" 0.55.1; then meson=3Dmeson elif test -e "${source_path}/.git" && test $git_update =3D 'yes' ; then meson=3Dgit diff --git a/meson b/meson index d0c68dc115..68ed748f84 160000 --- a/meson +++ b/meson @@ -1 +1 @@ -Subproject commit d0c68dc11507a47b9b85de508e023d9590d60565 +Subproject commit 68ed748f84f14c2d4e62dcbd123816e5898eb04c --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598951653; cv=none; d=zohomail.com; s=zohoarc; b=R9FnqL++9bXYe7SebL3VlEbzpUMyWZW+OB+RtXcQJkxrtffcx4SgZvV2ejtKNHBDtNZohVUX2dYXPWoRdoPeJyHrqw0Z25fSvGRil2n7CSkcNTGCp1AXduceZZCteLSR0au7GIPmBYG8R4YB+Xs9Wj8y+CXhCnDQBHisHxnCrqw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598951653; 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=x7MJbvEh1OB7aVH3KPkQw4pq5I4JgItwiVYVmNd7OOM=; b=SOuHI3ZOkXQaRvkmUYLT25+JMbBULxDq1sRksXE+jDps5ps4g4RBU6fHf9rB8uKKf1GudZP3haWwLc1tU86m+gzCsMUARGtQEZQITGNZCokuVXcDAIsIRTqidPoH388t6UCeNXLwcsAlnA6tjPSy26hRcJlboi/tHk6zbR8JSNY= 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 159895165392529.937775551352843; Tue, 1 Sep 2020 02:14:13 -0700 (PDT) Received: from localhost ([::1]:58976 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2Mn-00082c-2C for importer@patchew.org; Tue, 01 Sep 2020 05:14:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33524) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KI-0003B9-Ig for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:38 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:51739) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD2KH-0006og-2U for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:38 -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-416-w4kpHd5ePAuOkhFl2VwL1g-1; Tue, 01 Sep 2020 05:11:34 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC54B10082E8; Tue, 1 Sep 2020 09:11:33 +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 7A30560C04; Tue, 1 Sep 2020 09:11:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951496; 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=x7MJbvEh1OB7aVH3KPkQw4pq5I4JgItwiVYVmNd7OOM=; b=EgBsUCDcFdszWFVB+PC+aRLlOZn23ER25WL5NOEqiV7+kgbRwYar07ikE3r0Z1pPegBhrt 80uXY0JLuRr8vnrctJEDs0IBDdeQZ/0ktf7/acPP3V/qXShL6MplnkcPnitzaJmNwkYWx8 8KRcbz8RQmTJNmgfDbYdgreX7SKtk0M= X-MC-Unique: w4kpHd5ePAuOkhFl2VwL1g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 02/24] block: always link with zlib Date: Tue, 1 Sep 2020 05:11:10 -0400 Message-Id: <20200901091132.29601-3-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=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/31 23:17:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , qemu-block@nongnu.org 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" The qcow2 driver needs the zlib dependency. While emulators provided it through the migration code, this is not true of the tools. Move the dependency from the qcow1 rule directly into block_ss so that it is included unconditionally. Fixes build with --disable-qcow1. Reported-by: Thomas Huth Reviewed-by: Thomas Huth Cc: qemu-block@nongnu.org Signed-off-by: Paolo Bonzini --- block/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block/meson.build b/block/meson.build index 4dbbfe60b4..a3e56b7cd1 100644 --- a/block/meson.build +++ b/block/meson.build @@ -40,9 +40,9 @@ block_ss.add(files( 'vmdk.c', 'vpc.c', 'write-threshold.c', -), zstd) +), zstd, zlib) =20 -block_ss.add(when: [zlib, 'CONFIG_QCOW1'], if_true: files('qcow.c')) +block_ss.add(when: 'CONFIG_QCOW1', if_true: files('qcow.c')) block_ss.add(when: 'CONFIG_VDI', if_true: files('vdi.c')) block_ss.add(when: 'CONFIG_CLOOP', if_true: files('cloop.c')) block_ss.add(when: 'CONFIG_BOCHS', if_true: files('bochs.c')) --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598951559; cv=none; d=zohomail.com; s=zohoarc; b=c6HI+CGS0nJlrP/HaeEJ7gaprhHp61gK5Q3ddzf4OUEYPjRjJkXs7XSEYMVN8NhFiBhd/6Xeko2qGLq7ygtmJ43ctCbw3FEgQ8ivHM70fJVPbDM8nly6Pl+Q+NOTaE27Lkev79+qKGFkzbLL9rN+wbONrj+63WyiYrLt9Xdzlwk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598951559; 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=FXWDLARdHNrpA7a6adejzajvHVlFYS/OZTUmP9eu8pQ=; b=e3+XvM8xRbYaNLKFA6Y8B6RP63IzxmpqLu7V5Iq7VCR/DQIF/Vd79Z7SqAEGjW+OqMHWSsehsTdSn0N5um4keMyNXhO0MMyj7xf6rXRwxZmRHvG9f6a65KXvt7Jb6F3SfQ4l2jiCCgCtxefcL+G4l9Fni/vKE7qMbtHP8fEu6Qk= 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 1598951559467434.3618784262608; Tue, 1 Sep 2020 02:12:39 -0700 (PDT) Received: from localhost ([::1]:51046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2LG-0004se-5s for importer@patchew.org; Tue, 01 Sep 2020 05:12:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33560) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KL-0003D2-7F for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:41 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:37502 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 1kD2KJ-0006p9-Ka for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:40 -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-521-nyg_surgOamm4qLCrDFrRg-1; Tue, 01 Sep 2020 05:11:35 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 36F2E8015C5; Tue, 1 Sep 2020 09:11:34 +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 E7EF660C04; Tue, 1 Sep 2020 09:11:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951499; 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=FXWDLARdHNrpA7a6adejzajvHVlFYS/OZTUmP9eu8pQ=; b=LiqUNDtyPgQEwniKUIG9q/7OnqffiRTOWTO/UYrJ/N3dT1ruv5gUp+DUDxo5MnJzdLMe0W uLWrKjuhXv0yu+4L1lToaiLxo+kBLEDN4TVnC8IwHCdWO4py08QiQW4UJYd+nlNVF7xeT/ kRzV1FhpOc/CJYDdEYOLHinxmN5QwvU= X-MC-Unique: nyg_surgOamm4qLCrDFrRg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 03/24] meson: fix SDL2_image detection Date: Tue, 1 Sep 2020 05:11:11 -0400 Message-Id: <20200901091132.29601-4-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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/09/01 00:57:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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?Volker=20R=C3=BCmelin?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Volker R=C3=BCmelin Configure used to probe for SDL2_image in sdl_image_probe (). Meson should do the same. This fixes the following error on my system: Run-time dependency sdl2 found: YES 2.0.8 Found CMake: /usr/bin/cmake (3.17.0) Run-time dependency sdl-image found: NO (tried pkgconfig and cmake) ../qemu-master/meson.build:256:2: ERROR: Dependency "sdl-image" not found, tried pkgconfig and cmake A full log can be found at /home/ruemelin/rpmbuild/BUILD /qemu-5.1.50-build/meson-logs/meson-log.txt ERROR: meson setup failed Signed-off-by: Volker R=C3=BCmelin Message-Id: <20200829104158.7461-1-vr_qemu@t-online.de> Signed-off-by: Paolo Bonzini --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 1e7aee85e3..3c919e32f1 100644 --- a/meson.build +++ b/meson.build @@ -248,7 +248,7 @@ if sdl.found() # work around 2.0.8 bug sdl =3D declare_dependency(compile_args: '-Wno-undef', dependencies: sdl) - sdl_image =3D dependency('sdl-image', required: get_option('sdl_image'), + sdl_image =3D dependency('SDL2_image', required: get_option('sdl_image'), static: enable_static) else if get_option('sdl_image').enabled() --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598951777; cv=none; d=zohomail.com; s=zohoarc; b=Q9Ib+tHAEavdBAPgrrD/YWN3qdTyzmBOEwK+3gKyVn98UsNWLDSEp9o0SknMZ9wme5uyDJL6gm/HLQv2t93+3MTzCYyk2x7vmsauBVYora7874fiOOSRK4938cxnKyutUQPMCaNmJjQ0nJohqYA9QppQeUXf3Fo817Uh7FS1chc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598951777; 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=JPdka2ufkdaeXPcfDmLHvJN3beVzyIA2duedhvs1E38=; b=mmCPzKNJEb9TPlkIXV0VVuRwKB5r9t1+vRyiAwl71rJulZDeONKTgnYHTvLve04AtYiTu4hFCxJgaayx4mdyUYdiTnT45c25dHrnCPTO5B1kffMZ7dKAlmVjLikxuUpPhRpjcbfXn/Rz55kjo6yXYkSSvcJWqL/R7rV4T60bMOo= 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 1598951777761220.23015414471547; Tue, 1 Sep 2020 02:16:17 -0700 (PDT) Received: from localhost ([::1]:39730 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2Om-0003KK-Sz for importer@patchew.org; Tue, 01 Sep 2020 05:16:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KN-0003HI-Nh for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:43 -0400 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:44366 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 1kD2KK-0006pK-Bd for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:43 -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-243-bSvNzuGZM-a0Bx6q06CE-g-1; Tue, 01 Sep 2020 05:11:38 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6038D18A2243 for ; Tue, 1 Sep 2020 09:11:37 +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 5234861177; Tue, 1 Sep 2020 09:11:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951499; 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=JPdka2ufkdaeXPcfDmLHvJN3beVzyIA2duedhvs1E38=; b=jG+mucSx/Mbvk50fGClxr2GIdZIi+rAD9kHLnSvQ558tnAiZMGK44k9Vlects8UchNkpAF XG6tCs5AdQiQaphFrfX5tB0jZ9LX4R/vdegvNsB9oAcpDmeRJUrWFjIBCiqfSTB6QTGYl3 p1kVNBONFqNT4DsIvVb2opeuA1yKybM= X-MC-Unique: bSvNzuGZM-a0Bx6q06CE-g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 04/24] meson: install pc-bios blobs Date: Tue, 1 Sep 2020 05:11:12 -0400 Message-Id: <20200901091132.29601-5-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=207.211.31.81; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 02:08:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200826130622.553318-2-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- Makefile | 31 ---------------------- pc-bios/meson.build | 63 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 31 deletions(-) diff --git a/Makefile b/Makefile index 81794d5c34..16b2ffa7fe 100644 --- a/Makefile +++ b/Makefile @@ -229,32 +229,6 @@ distclean: clean ninja-distclean rm -f linux-headers/asm rm -Rf .sdk =20 -ifdef INSTALL_BLOBS -BLOBS=3Dbios.bin bios-256k.bin bios-microvm.bin sgabios.bin vgabios.bin vg= abios-cirrus.bin \ -vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin vgabios-virtio.bin \ -vgabios-ramfb.bin vgabios-bochs-display.bin vgabios-ati.bin \ -openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin QEMU,cgthree.b= in \ -pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \ -pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \ -efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \ -efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \ -efi-e1000e.rom efi-vmxnet3.rom \ -qemu-nsis.bmp \ -bamboo.dtb canyonlands.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \ -multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin \ -s390-ccw.img s390-netboot.img \ -slof.bin skiboot.lid \ -palcode-clipper \ -u-boot.e500 u-boot-sam460-20100605.bin \ -qemu_vga.ndrv \ -edk2-licenses.txt \ -hppa-firmware.img \ -opensbi-riscv32-generic-fw_dynamic.bin opensbi-riscv64-generic-fw_dynamic.= bin \ -opensbi-riscv32-generic-fw_dynamic.elf opensbi-riscv64-generic-fw_dynamic.= elf -else -BLOBS=3D -endif - install-datadir: $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)" =20 @@ -272,11 +246,6 @@ export DESTDIR install: all install-datadir install-localstatedir ifdef CONFIG_TRACE_SYSTEMTAP $(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir) -endif -ifneq ($(BLOBS),) - set -e; for x in $(BLOBS); do \ - $(INSTALL_DATA) $(SRC_PATH)/pc-bios/$$x "$(DESTDIR)$(qemu_datadir)"; \ - done endif for s in $(ICON_SIZES); do \ mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \ diff --git a/pc-bios/meson.build b/pc-bios/meson.build index b6389f5148..f608c2cdba 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -24,5 +24,68 @@ if 'DECOMPRESS_EDK2_BLOBS' in config_host endforeach endif =20 +blobs =3D files( + 'bios.bin', + 'bios-256k.bin', + 'bios-microvm.bin', + 'sgabios.bin', + 'vgabios.bin', + 'vgabios-cirrus.bin', + 'vgabios-stdvga.bin', + 'vgabios-vmware.bin', + 'vgabios-qxl.bin', + 'vgabios-virtio.bin', + 'vgabios-ramfb.bin', + 'vgabios-bochs-display.bin', + 'vgabios-ati.bin', + 'openbios-sparc32', + 'openbios-sparc64', + 'openbios-ppc', + 'QEMU,tcx.bin', + 'QEMU,cgthree.bin', + 'pxe-e1000.rom', + 'pxe-eepro100.rom', + 'pxe-ne2k_pci.rom', + 'pxe-pcnet.rom', + 'pxe-rtl8139.rom', + 'pxe-virtio.rom', + 'efi-e1000.rom', + 'efi-eepro100.rom', + 'efi-ne2k_pci.rom', + 'efi-pcnet.rom', + 'efi-rtl8139.rom', + 'efi-virtio.rom', + 'efi-e1000e.rom', + 'efi-vmxnet3.rom', + 'qemu-nsis.bmp', + 'bamboo.dtb', + 'canyonlands.dtb', + 'petalogix-s3adsp1800.dtb', + 'petalogix-ml605.dtb', + 'multiboot.bin', + 'linuxboot.bin', + 'linuxboot_dma.bin', + 'kvmvapic.bin', + 'pvh.bin', + 's390-ccw.img', + 's390-netboot.img', + 'slof.bin', + 'skiboot.lid', + 'palcode-clipper', + 'u-boot.e500', + 'u-boot-sam460-20100605.bin', + 'qemu_vga.ndrv', + 'edk2-licenses.txt', + 'hppa-firmware.img', + 'opensbi-riscv32-generic-fw_dynamic.bin', + 'opensbi-riscv64-generic-fw_dynamic.bin', + 'opensbi-riscv32-generic-fw_dynamic.elf', + 'opensbi-riscv64-generic-fw_dynamic.elf', +) + +if install_blobs + install_data(blobs, install_dir: config_host['qemu_datadir']) +endif + subdir('descriptors') subdir('keymaps') --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598951660; cv=none; d=zohomail.com; s=zohoarc; b=BmqO3ssP+3dSI9h+mZrXkwDTVkvuIlK3ggNggK3YXcPhRHilWiFc12wHBCb65bfG8ur/pnT86/1900DMdqeslJ4lnMaULanYuzskrizFpvXkEOkTchEEzn+e2XwWwYMOjYcjYsWav6tJnOgYkYTsTBpw58oazeD0Mn/LKzWI3S4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598951660; 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=t+dKI3qjYJg00VqsMnzVtH8QIjKITSYPyEy9jJCw6pk=; b=oJ0WUNVsr45d+i+XdFo1x2Y0zK76tvDvy+nMutDzZwD6pWjMWEJ2buCkga+Xy+Iwg8BsBQHig0+bXldD0gxY1q+9aAQglDD4JZPVtyK6UNbRSb0CbGan8RFGeEw1cpWE9sU9sG7OBKuth59oIZgzu0vb6Nm6wYRHBthL9bGry94= 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 1598951660498998.5403457747668; Tue, 1 Sep 2020 02:14:20 -0700 (PDT) Received: from localhost ([::1]:59416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2Mt-0008DX-L5 for importer@patchew.org; Tue, 01 Sep 2020 05:14:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KM-0003FK-NL for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:42 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:50594) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD2KK-0006pO-T0 for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:42 -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-52-HLu1Yt1ROd6139NgrMozuw-1; Tue, 01 Sep 2020 05:11:38 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BE64F51B5 for ; Tue, 1 Sep 2020 09:11:37 +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 7A99A60C04; Tue, 1 Sep 2020 09:11:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951500; 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=t+dKI3qjYJg00VqsMnzVtH8QIjKITSYPyEy9jJCw6pk=; b=LUYlBIljTobX0Zi7I2ju1gs6lkv4IRowrxPfHR16cSXPJ+FprFw1PtEmSoaOP2jNzzG3jO ZAUt+yZ2r0JFWNbMp37i1QCDrTt2M2k7MB1OMBcgkcHZVBJNo1aExN8c5NJx2VpApkvjVo MEsgnrJG9pK2gZrmy1muSMRmRflvvec= X-MC-Unique: HLu1Yt1ROd6139NgrMozuw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 05/24] meson: install scripts/qemu-trace-stap Date: Tue, 1 Sep 2020 05:11:13 -0400 Message-Id: <20200901091132.29601-6-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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/31 23:17:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200826130622.553318-3-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- Makefile | 3 --- meson.build | 1 + scripts/meson.build | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 scripts/meson.build diff --git a/Makefile b/Makefile index 16b2ffa7fe..058cf87f54 100644 --- a/Makefile +++ b/Makefile @@ -244,9 +244,6 @@ ICON_SIZES=3D16x16 24x24 32x32 48x48 64x64 128x128 256x= 256 512x512 # Needed by "meson install" export DESTDIR install: all install-datadir install-localstatedir -ifdef CONFIG_TRACE_SYSTEMTAP - $(INSTALL_PROG) "scripts/qemu-trace-stap" $(DESTDIR)$(bindir) -endif for s in $(ICON_SIZES); do \ mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \ $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_$${s}.png \ diff --git a/meson.build b/meson.build index 3c919e32f1..6b2fc76933 100644 --- a/meson.build +++ b/meson.build @@ -1138,6 +1138,7 @@ if have_tools endif endif =20 +subdir('scripts') subdir('tools') subdir('pc-bios') subdir('tests') diff --git a/scripts/meson.build b/scripts/meson.build new file mode 100644 index 0000000000..e8cc63896d --- /dev/null +++ b/scripts/meson.build @@ -0,0 +1,3 @@ +if 'CONFIG_TRACE_SYSTEMTAP' in config_host + install_data('qemu-trace-stap', install_dir: get_option('bindir')) +endif --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598951661; cv=none; d=zohomail.com; s=zohoarc; b=ikMoWiY6MRlEAz3lK7J/GGTmdLKmxXodVDTKlETK1IURe25NAcjWbEFLSCPRstb5ijjfl5/8bmERTC3kIoXcOI3eMCk5FfNvQCoJ3K5krH2i4o72cb0eziCUOtFela5XxrpvvXbITpn4uJLLUDCt3SU25R3DRJdc0YtZhiOk7AE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598951661; 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=1ZzSRczycqmp9PBXMjkOtQBBLOIhayetEpr+VUncjTU=; b=WG76lBISxLxbk6YPMLPyegw1jJVWHkzinib9lnDwBWVkPPRUK5flFsXjJCh4yQMUq+iwg8SZ+0llUs0PEpjRlbHzdbgir/Tfm66189PjslbOnro3JWDPhIVbRNSYzlpkUPpTcv4HSpcJuNGMR2yX/DfcGINW1i/Q5Hc8e80/rVA= 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 1598951661699922.8956522789343; Tue, 1 Sep 2020 02:14:21 -0700 (PDT) Received: from localhost ([::1]:59526 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2Mu-0008G1-Vd for importer@patchew.org; Tue, 01 Sep 2020 05:14:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33632) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KN-0003G8-4O for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:38899) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD2KL-0006pS-8Y for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:42 -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-574-cPki1YIXNVmtUo8yV6QQ-w-1; Tue, 01 Sep 2020 05:11:39 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2A6681074641 for ; Tue, 1 Sep 2020 09:11:38 +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 DA29A9F54; Tue, 1 Sep 2020 09:11:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951500; 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=1ZzSRczycqmp9PBXMjkOtQBBLOIhayetEpr+VUncjTU=; b=D8vvnGYeGcutPPhOOBAP2SSnkUcrOsnrl9OD27kqzRHLIVU8MhG02jxi4NO+twlP9GPx9N BfTnWFkY0qk1fPBNjfU10sAgiFRm0eS6AQLfKVEpz61r8zl3UeoIYSHDUJ2laXYhH5gK9x it7V4hQEdlX63v8+iQ+tPkSuwYhdiho= X-MC-Unique: cPki1YIXNVmtUo8yV6QQ-w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 06/24] meson: install icons Date: Tue, 1 Sep 2020 05:11:14 -0400 Message-Id: <20200901091132.29601-7-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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/31 23:17:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200826130622.553318-4-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- Makefile | 12 ------------ ui/icons/meson.build | 13 +++++++++++++ ui/meson.build | 1 + 3 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 ui/icons/meson.build diff --git a/Makefile b/Makefile index 058cf87f54..d1a3cd77a5 100644 --- a/Makefile +++ b/Makefile @@ -239,22 +239,10 @@ ifeq ($(CONFIG_GUEST_AGENT),y) endif endif =20 -ICON_SIZES=3D16x16 24x24 32x32 48x48 64x64 128x128 256x256 512x512 =20 # Needed by "meson install" export DESTDIR install: all install-datadir install-localstatedir - for s in $(ICON_SIZES); do \ - mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps"; \ - $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_$${s}.png \ - "$(DESTDIR)$(qemu_icondir)/hicolor/$${s}/apps/qemu.png"; \ - done; \ - mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/32x32/apps"; \ - $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu_32x32.bmp \ - "$(DESTDIR)$(qemu_icondir)/hicolor/32x32/apps/qemu.bmp"; \ - mkdir -p "$(DESTDIR)$(qemu_icondir)/hicolor/scalable/apps"; \ - $(INSTALL_DATA) $(SRC_PATH)/ui/icons/qemu.svg \ - "$(DESTDIR)$(qemu_icondir)/hicolor/scalable/apps/qemu.svg" mkdir -p "$(DESTDIR)$(qemu_desktopdir)" $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \ "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop" diff --git a/ui/icons/meson.build b/ui/icons/meson.build new file mode 100644 index 0000000000..b6e21f6ad7 --- /dev/null +++ b/ui/icons/meson.build @@ -0,0 +1,13 @@ +foreach s: [16, 24, 32, 48, 64, 128, 256, 512] + s =3D '@0@x@0@'.format(s.to_string()) + install_data('qemu_@0@.png'.format(s), + rename: 'qemu.png', + install_dir: config_host['qemu_icondir'] / 'hicolor' / s / = 'apps') +endforeach + +install_data('qemu_32x32.bmp', + rename: 'qemu.bmp', + install_dir: config_host['qemu_icondir'] / 'hicolor' / '32x32= ' / 'apps') + +install_data('qemu.svg', + install_dir: config_host['qemu_icondir'] / 'hicolor' / 'scala= ble' / 'apps') diff --git a/ui/meson.build b/ui/meson.build index 962e776569..dddffc9a7a 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -112,5 +112,6 @@ if have_system or xkbcommon.found() endif =20 subdir('shader') +subdir('icons') =20 modules +=3D {'ui': ui_modules} --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598951778; cv=none; d=zohomail.com; s=zohoarc; b=WzZsIjdxYKG3YB1UUSScIP2t51thOAKLBsQEqP82IZZQZyLkmjeaz4B44T0xOhjVlTP8X39hp9ksuSiJ8feC/APKzExQMsnYrdRVXcnbL4chR1UECB+Aen9F7Ehys1ycVIps4eeCIFEvlL4nRexQPXHoQnWIzAyLIQOriAkXlQw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598951778; 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=oPYm07pdt7b0LPaW8u7gz2M+Nt/MTH4OJWkZrN9NJzY=; b=Yr9HazkCnBO8jXuwxY31wmao+aePyIkz/eFITI5NovvLAN1uNK//TwVHI5qv7pIpdtN9aqXeY5XQ7U+eWz2WUn7VyFpPiHtBV2YZXCT+RD4sIwUo87DtJUphAdjQebG0QmnOhZsaBR6xkBlSq2IogQZxyh/K7uAbjcZHlnvAFWE= 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 1598951778742391.242888687544; Tue, 1 Sep 2020 02:16:18 -0700 (PDT) Received: from localhost ([::1]:39740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2On-0003Kn-SX for importer@patchew.org; Tue, 01 Sep 2020 05:16:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33638) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KN-0003Gf-Dy for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:43 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:31420 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 1kD2KL-0006pd-Kb for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:43 -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-39--FSNXT8IMVaJ7j0uigYluQ-1; Tue, 01 Sep 2020 05:11:39 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 897FE800C60 for ; Tue, 1 Sep 2020 09:11:38 +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 45F2860C04; Tue, 1 Sep 2020 09:11:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951501; 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=oPYm07pdt7b0LPaW8u7gz2M+Nt/MTH4OJWkZrN9NJzY=; b=h877/E9NsGOg/odl7KWA/G39wrdpuhatWfqwjeUGyl2ueSX3wnx7sPemg6WDSbMrCQNJMb NI9K2778aoGP+HyqApSoZ4+WH8P3n/npfKylKsAld8K/Le+j0pUyS24wh/GqM/NOvtcNaT 3r59moyRuHv42M1j2l5Nw0cM6aymPVU= X-MC-Unique: -FSNXT8IMVaJ7j0uigYluQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 07/24] meson: install desktop file Date: Tue, 1 Sep 2020 05:11:15 -0400 Message-Id: <20200901091132.29601-8-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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/09/01 00:57:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200826130622.553318-5-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- Makefile | 3 --- ui/meson.build | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d1a3cd77a5..dc3c20dd5e 100644 --- a/Makefile +++ b/Makefile @@ -243,9 +243,6 @@ endif # Needed by "meson install" export DESTDIR install: all install-datadir install-localstatedir - mkdir -p "$(DESTDIR)$(qemu_desktopdir)" - $(INSTALL_DATA) $(SRC_PATH)/ui/qemu.desktop \ - "$(DESTDIR)$(qemu_desktopdir)/qemu.desktop" $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" =20 ifdef CONFIG_WIN32 diff --git a/ui/meson.build b/ui/meson.build index dddffc9a7a..aa8aa31516 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -114,4 +114,6 @@ endif subdir('shader') subdir('icons') =20 +install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir']) + modules +=3D {'ui': ui_modules} --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598951665; cv=none; d=zohomail.com; s=zohoarc; b=V/wc6GlVlE9RTOZRwRW6ynPpGUU+ulMoZA/FqMMSP8/sPbN3WWqu2436Emdhd9+4WfeoNi7XV4tL0EGSqE+N4GBBvqwQ22+u4pqo3gW3g4jtbw165pXQII8Nk1UFuY+wnXdYRfvmrV3SsTiV5yA7Wdowc9Wixtwa1SD0/51FRU8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598951665; 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=aNNQDVuDEIT+8rZ01piCMx/NSBZ0hzrGt3QGQ67X3uw=; b=e1wjVOTuWBPnM3xlZclG8vJ2ppjyGBZqPawqXQP/xzMy4U/0aNEhnsSzirwYBhnJjowLl8Hf2YhtPWwNua1bmEcn7Ubzfs8ejsJi4b3mEvHovF9lh5IjpJE5Xd++zzHLnFL09AVS/3lYIbdpF5TDdbHVM8Wle4fxTyEA22sdx6o= 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 1598951665139841.8024737472815; Tue, 1 Sep 2020 02:14:25 -0700 (PDT) Received: from localhost ([::1]:59894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2My-0008P8-Bx for importer@patchew.org; Tue, 01 Sep 2020 05:14:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KO-0003J2-E6 for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:44 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:53161 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 1kD2KL-0006pg-RQ for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:44 -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-238-qANU7hNEOuyuzZeXXQFFPA-1; Tue, 01 Sep 2020 05:11:39 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E9A4A8015C5 for ; Tue, 1 Sep 2020 09:11:38 +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 A59B660C04; Tue, 1 Sep 2020 09:11:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951501; 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=aNNQDVuDEIT+8rZ01piCMx/NSBZ0hzrGt3QGQ67X3uw=; b=Z4HlxiVqRixD5st+0dtYJU/1HtFOan4xqhtqj24iSzjAbKHLNWL3vr6WKfsuTKlhl1CQkZ lEj9m/09iYEk+BcE6niybV1sDHVCiXmHGm+mTdrADFZccSZSOtPlmRkmC7qQ+K63vTvWA6 nzZUSQ09pU29bSSy+pgEouE05+2hABE= X-MC-Unique: qANU7hNEOuyuzZeXXQFFPA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 08/24] meson: install $localstatedir/run for qga Date: Tue, 1 Sep 2020 05:11:16 -0400 Message-Id: <20200901091132.29601-9-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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/09/01 05:11:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200826130622.553318-6-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- Makefile | 10 +--------- qga/meson.build | 2 ++ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index dc3c20dd5e..9a9e7c0301 100644 --- a/Makefile +++ b/Makefile @@ -232,17 +232,9 @@ distclean: clean ninja-distclean install-datadir: $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)" =20 -install-localstatedir: -ifdef CONFIG_POSIX -ifeq ($(CONFIG_GUEST_AGENT),y) - $(INSTALL_DIR) "$(DESTDIR)$(qemu_localstatedir)"/run -endif -endif - - # Needed by "meson install" export DESTDIR -install: all install-datadir install-localstatedir +install: all install-datadir $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" =20 ifdef CONFIG_WIN32 diff --git a/qga/meson.build b/qga/meson.build index 3f28f74b52..e5c5778a3e 100644 --- a/qga/meson.build +++ b/qga/meson.build @@ -82,6 +82,8 @@ if targetos =3D=3D 'windows' all_qga +=3D [qga_msi] alias_target('msi', qga_msi) endif +else + install_subdir('run', install_dir: get_option('localstatedir')) endif =20 alias_target('qemu-ga', all_qga) --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598951565; cv=none; d=zohomail.com; s=zohoarc; b=n+ZGcp2deNwG8pKCgvJ/vhV7BwBWLrA29w71LgRMHKkjDtF9i5wws5QlysUHwe/R/0onNOEENXbS+x8SqMgVx4Kd42RDzaMrPdrvrqAB3eT8xSgh3lq1FGFYtKMZhbFhTdRoLuco9MY304BcJEwAw4BfOJRH5Lx07/j1MRoqD4I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598951565; 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=ygfy241D0COZfIUlwt1kciZHAmJP5w0+YVaz0iDvDUs=; b=PePg4UXIZKDSNhCq99B4MydP4lWLiz9tEWy17lcuYDOnWwOThB8vN3l8Ey58sfDwwpJNJSvEOaCYbtchqAwYhvR77BIYSDb8AVlnLtlge6p2MfoOZVpCyJPgdGaL8gY49Pi8d5IxsB18Qqb8HWZoSj8pI+GGw9x1Edcq2OZQcXc= 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 1598951565358953.8167907622881; Tue, 1 Sep 2020 02:12:45 -0700 (PDT) Received: from localhost ([::1]:51446 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2LK-00053H-IV for importer@patchew.org; Tue, 01 Sep 2020 05:12:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KO-0003Jw-P3 for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:44 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:52772) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD2KM-0006px-Pc for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:44 -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-28-GxWnCKoaPImyd3gbvLlWsw-1; Tue, 01 Sep 2020 05:11:40 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 55AA610082E6 for ; Tue, 1 Sep 2020 09:11:39 +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 1147A60C04; Tue, 1 Sep 2020 09:11:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951502; 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=ygfy241D0COZfIUlwt1kciZHAmJP5w0+YVaz0iDvDUs=; b=AU39dnJsOZQxQOsLC+qypQlLsyVYhHDqTom05GaKWkVreApmthvg4dt+ndwQZtqWf+WMah ypsvpXeYwn7IW6fZOYnjlaS1heVdQQYq5m8w+fjpPD2QxXw06eRdXHEOMe47loB2clznPb Ml54py2iRoP5tvOuLmae8gRMHa8ucQE= X-MC-Unique: GxWnCKoaPImyd3gbvLlWsw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 09/24] build-sys: remove install target from Makefile Date: Tue, 1 Sep 2020 05:11:17 -0400 Message-Id: <20200901091132.29601-10-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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/31 23:17:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Now covered by meson Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200826130622.553318-7-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Makefile b/Makefile index 9a9e7c0301..75db8be52e 100644 --- a/Makefile +++ b/Makefile @@ -229,13 +229,8 @@ distclean: clean ninja-distclean rm -f linux-headers/asm rm -Rf .sdk =20 -install-datadir: - $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)" - # Needed by "meson install" export DESTDIR -install: all install-datadir - $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/keymaps" =20 ifdef CONFIG_WIN32 =20 --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598951777; cv=none; d=zohomail.com; s=zohoarc; b=T4459oBu2+sfawsY79a08b5zhJ5H/yY/wcXT8KT8GM2/0rZNlMESubmOWgKWVbT3QwRoUXLmlqUeriu+i7M4Jtpvx6Nc0DO2ed7cVN/eR5YX3mQIzSyBXc/sZVe2CF/PfLR+oABBKervQZQ0BsMHN+kgdpm23Ph03Dvukqtbu4w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598951777; 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=pbS219AVLb1A+L1jEI7CAc136MB75Gui7SQ3+JMr1Hk=; b=ZW3gelQBRGKnZZXkMSPF6b1yP4zN3sLIP/An80d2YicdAyEyYHLkzdDQuVkgbZfmxEtSgGOs/QtFImYq8XsVkaW4TGP5+lihvu9SMTGwUmD/wG+ZgRx76Hoh9UvnLERzno734CnhrWCbWiw8Ape2Fqpp5VUDIMviSihPeazM6jI= 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 159895177746184.6645317201685; Tue, 1 Sep 2020 02:16:17 -0700 (PDT) Received: from localhost ([::1]:39640 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2Om-0003Gl-Hm for importer@patchew.org; Tue, 01 Sep 2020 05:16:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33708) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KP-0003Lc-Bn for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37915) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD2KN-0006qA-En for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:44 -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-375-6nplcxToO4WmAUJn4w5O6g-1; Tue, 01 Sep 2020 05:11:40 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1877418A2243 for ; Tue, 1 Sep 2020 09:11:40 +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 BDEB661177; Tue, 1 Sep 2020 09:11:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951502; 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=pbS219AVLb1A+L1jEI7CAc136MB75Gui7SQ3+JMr1Hk=; b=TPeatHzRTbGznXuH61kaRrbvzBwCMbdROjcRZHAaTcESS2ybxPJ/Ht7dIRYNU/A4oW5SuI rY2cRUs8Pj+s6TVa1QC3bT1yyojKrsrQ2q/Ikk1NCiBRfOKeAl1xoNKPttIRQ99c8dDJaj dpb+DkbW+XitNQIBRE8PvdYKlY/nN2U= X-MC-Unique: 6nplcxToO4WmAUJn4w5O6g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/24] meson: move zlib detection to meson Date: Tue, 1 Sep 2020 05:11:18 -0400 Message-Id: <20200901091132.29601-11-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=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/09/01 01:27:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Meson includes the same logic that tries to look for -lz if pkg-config (and cmake) cannot find zlib. The undocumented --disable-zlib-test option becomes a no-op. There is still an instance of "-lz" in the LIBS directory. It will go away as soon as tests are converted to meson, because the zlib dependency does not propagate from libblock.fa to the Makefile-build unit tests. Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Paolo Bonzini --- configure | 32 +------------------------------- meson.build | 6 +----- 2 files changed, 2 insertions(+), 36 deletions(-) diff --git a/configure b/configure index f81900880a..e8946aeefb 100755 --- a/configure +++ b/configure @@ -502,7 +502,6 @@ opengl=3D"" opengl_dmabuf=3D"no" cpuid_h=3D"no" avx2_opt=3D"" -zlib=3D"yes" capstone=3D"" lzo=3D"" snappy=3D"" @@ -1428,7 +1427,7 @@ for opt do ;; --enable-usb-redir) usb_redir=3D"yes" ;; - --disable-zlib-test) zlib=3D"no" + --disable-zlib-test) ;; --disable-lzo) lzo=3D"no" ;; @@ -3904,30 +3903,6 @@ if ! compile_prog "$glib_cflags -Werror" "$glib_libs= " ; then fi fi =20 -######################################### -# zlib check - -if test "$zlib" !=3D "no" ; then - if $pkg_config --exists zlib; then - zlib_cflags=3D$($pkg_config --cflags zlib) - zlib_libs=3D$($pkg_config --libs zlib) - QEMU_CFLAGS=3D"$zlib_cflags $QEMU_CFLAGS" - LIBS=3D"$zlib_libs $LIBS" - else - cat > $TMPC << EOF -#include -int main(void) { zlibVersion(); return 0; } -EOF - if compile_prog "" "-lz" ; then - zlib_libs=3D-lz - LIBS=3D"$LIBS $zlib_libs" - else - error_exit "zlib check failed" \ - "Make sure to have the zlib libs and headers installed." - fi - fi -fi - ########################################## # SHA command probe for modules if test "$modules" =3D yes; then @@ -7135,11 +7110,6 @@ fi if test "$posix_memalign" =3D "yes" ; then echo "CONFIG_POSIX_MEMALIGN=3Dy" >> $config_host_mak fi -if test "$zlib" !=3D "no" ; then - echo "CONFIG_ZLIB=3Dy" >> $config_host_mak - echo "ZLIB_CFLAGS=3D$zlib_cflags" >> $config_host_mak - echo "ZLIB_LIBS=3D$zlib_libs" >> $config_host_mak -fi if test "$spice" =3D "yes" ; then echo "CONFIG_SPICE=3Dy" >> $config_host_mak echo "SPICE_CFLAGS=3D$spice_cflags" >> $config_host_mak diff --git a/meson.build b/meson.build index 6b2fc76933..8b28ecff28 100644 --- a/meson.build +++ b/meson.build @@ -134,11 +134,7 @@ if 'CONFIG_AUTH_PAM' in config_host pam =3D cc.find_library('pam') endif libaio =3D cc.find_library('aio', required: false) -zlib =3D not_found -if 'CONFIG_ZLIB' in config_host - zlib =3D declare_dependency(compile_args: config_host['ZLIB_CFLAGS'].spl= it(), - link_args: config_host['ZLIB_LIBS'].split()) -endif +zlib =3D dependency('zlib', required: true) linux_io_uring =3D not_found if 'CONFIG_LINUX_IO_URING' in config_host linux_io_uring =3D declare_dependency(compile_args: config_host['LINUX_I= O_URING_CFLAGS'].split(), --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598951865; cv=none; d=zohomail.com; s=zohoarc; b=ZogzzCAek3G80kshu8JCfm2sPOvVEUMzAnUZwyZbirbug3WMKaug8glHNXLkZA9m4GZTYzAHU/4dX6EinuvsoeKAIkXrLsegfFpKcatXhdHnr0s+TbfSs2DJCYCgBZ1yqcsvAKDRl0Lg5MAnckFlTfR9LTjI6Lrm3QOKGWt4CEA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598951865; 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=3z48+mTQRrcGpLheH51SDHiog+LS5vtfZFJ1Ox8RXDw=; b=auc7b+n3oVn/4lzn8BN641eiwPwIxb6jq12BYwZ+hMMoVqfNEgvVusbOmtfssBfedcuTfQr4xXs7pJTv6T0xxzulbSnCR215QZqDWKuB3Rf8qhBLGHj1UzjdiOPncppZLZ7DoC6TVDq8ZqUoZhMNE15r/ko0Z4mHam7bFoCUCzo= 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 1598951865335395.5956856005482; Tue, 1 Sep 2020 02:17:45 -0700 (PDT) Received: from localhost ([::1]:47996 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2QB-0006f6-Vn for importer@patchew.org; Tue, 01 Sep 2020 05:17:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KP-0003Mi-Q8 for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:45 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:35938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD2KN-0006qG-NT for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:45 -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-579-IBTMCpEhMc6aD0kml3OIfg-1; Tue, 01 Sep 2020 05:11:41 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 88667801AC9 for ; Tue, 1 Sep 2020 09:11:40 +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 397AE60C04; Tue, 1 Sep 2020 09:11:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951503; 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=3z48+mTQRrcGpLheH51SDHiog+LS5vtfZFJ1Ox8RXDw=; b=aSUC6BoacAtC/Z7stZSwkJmuUNyEC95ZSjmVjnVLIwuH+I9ka4KGqQzMHhVIxmhwAbK3+e qYijmao+zhLgJbJHIqZMC+DnpdHZTIQiX6uqySIYIbkEWZtcz78L9hX/q2WD1LLXO6YTGy Te71grvEgmfuK5fGuNIhgGXAIwoTnF4= X-MC-Unique: IBTMCpEhMc6aD0kml3OIfg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 11/24] configure: rename confsuffix option Date: Tue, 1 Sep 2020 05:11:19 -0400 Message-Id: <20200901091132.29601-12-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=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/09/01 01:27:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau The value is used to construct conf/mod/data directories. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200826110419.528931-2-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/configure b/configure index e8946aeefb..46fe7914c3 100755 --- a/configure +++ b/configure @@ -474,7 +474,7 @@ modules=3D"no" module_upgrades=3D"no" prefix=3D"/usr/local" firmwarepath=3D"\${prefix}/share/qemu-firmware" -confsuffix=3D"/qemu" +qemu_suffix=3D"/qemu" slirp=3D"" oss_lib=3D"" bsd=3D"no" @@ -1012,7 +1012,7 @@ if test "$mingw32" =3D "yes" ; then LIBS=3D"-liberty $LIBS" fi prefix=3D"c:/Program Files/QEMU" - confsuffix=3D"" + qemu_suffix=3D"" libs_qga=3D"-lws2_32 -lwinmm -lpowrprof -lwtsapi32 -lwininet -liphlpapi = -lnetapi32 $libs_qga" fi =20 @@ -1122,7 +1122,7 @@ for opt do ;; --datadir=3D*) datadir=3D"$optarg" ;; - --with-confsuffix=3D*) confsuffix=3D"$optarg" + --with-suffix=3D*) qemu_suffix=3D"$optarg" ;; --docdir=3D*) qemu_docdir=3D"$optarg" ;; @@ -1832,16 +1832,16 @@ Advanced options (experts only): --with-git=3DGIT use specified git [$git] --static enable static build [$static] --mandir=3DPATH install man pages in PATH - --datadir=3DPATH install firmware in PATH$confsuffix - --docdir=3DPATH install documentation in PATH$confsuffix + --datadir=3DPATH install firmware in PATH$qemu_suffix + --docdir=3DPATH install documentation in PATH$qemu_suffix --bindir=3DPATH install binaries in PATH --libdir=3DPATH install libraries in PATH --libexecdir=3DPATH install helper binaries in PATH - --sysconfdir=3DPATH install config in PATH$confsuffix + --sysconfdir=3DPATH install config in PATH$qemu_suffix --localstatedir=3DPATH install local state in PATH (set at runtime o= n win32) --firmwarepath=3DPATH search PATH for firmware files --efi-aarch64=3DPATH PATH of efi file to use for aarch64 VMs. - --with-confsuffix=3DSUFFIX suffix for QEMU data inside datadir/libdir/sy= sconfdir [$confsuffix] + --with-suffix=3DSUFFIX suffix for QEMU data inside datadir/libdir/sy= sconfdir [$qemu_suffix] --with-pkgversion=3DVERS use specified string as sub-version of the pa= ckage --enable-debug enable common debug build options --enable-sanitizers enable default sanitizers @@ -6449,9 +6449,9 @@ EOF fi fi =20 -qemu_confdir=3D$sysconfdir$confsuffix -qemu_moddir=3D$libdir$confsuffix -qemu_datadir=3D$datadir$confsuffix +qemu_confdir=3D$sysconfdir$qemu_suffix +qemu_moddir=3D$libdir$qemu_suffix +qemu_datadir=3D$datadir$qemu_suffix qemu_localedir=3D"$datadir/locale" qemu_icondir=3D"$datadir/icons" qemu_desktopdir=3D"$datadir/applications" --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598951945; cv=none; d=zohomail.com; s=zohoarc; b=MpuyKKTITJWVFP7wd3dBe5aQMbvcTLJsV5TVdXdXF5JIoMRIGJYY0v7/sIpjhNVgcptxt/21OW+xRHhlycBNMQ1jTNe/fn+U+XCuDeiLH3q5qavkOJnOtcMMo5zl10aufXBGk3dgeRx6PdHGTNV+wnFWVrGPutaX1prj9YnfyDo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598951945; 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=Kg4ZoqXk5CQD2CyD8431gj7afNbeX9w0CyWNhXSaw1o=; b=kLddMHYITib2u1jwFRcnC8zunJB3DxKmblzbKA4GRF4g98l/l5GjzJLykJGp+thTVMvO6LqxMmuXKW6pHEk9UlOGIm5RVwAm/YW3d1b/3D+29p8JWOM6Jr2BmCKvqrgyV6FsPGHZGUyP7ch4OXq6+vr7fKPFJCPx+jXUcKmbxX0= 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 1598951945464495.3337013155028; Tue, 1 Sep 2020 02:19:05 -0700 (PDT) Received: from localhost ([::1]:54764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2RU-0000uU-J8 for importer@patchew.org; Tue, 01 Sep 2020 05:19:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33724) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KQ-0003NB-0W for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55721) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD2KO-0006qY-7s for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:45 -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-421-utbQX6ZWPvmi_aDQHFjQ1A-1; Tue, 01 Sep 2020 05:11:41 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 043AA10082E6 for ; Tue, 1 Sep 2020 09:11:41 +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 A937E60C04; Tue, 1 Sep 2020 09:11:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951503; 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=Kg4ZoqXk5CQD2CyD8431gj7afNbeX9w0CyWNhXSaw1o=; b=GBzADFnaXZSYLLkNWi4tEHWKNT3PQ/eIQaQa4oLrVVK/QX7kd3u+ZPJsZcW4Vu49rz1by0 xPpQ3y+C+64PPSLOrNzb6S72hn+w2hFyCmLZnq50N817w9xwon/mG6pKpEvUu2sH2z5nz4 7HWl4AfhShl68MmjzG87Mf8IMAMB9d8= X-MC-Unique: utbQX6ZWPvmi_aDQHFjQ1A-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 12/24] configure: always /-seperate directory from qemu_suffix Date: Tue, 1 Sep 2020 05:11:20 -0400 Message-Id: <20200901091132.29601-13-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=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/09/01 01:27:29 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Otherwise, we may accept very strange directory names... While at it, quote the variables. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200826110419.528931-3-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/configure b/configure index 46fe7914c3..66d7a72aa9 100755 --- a/configure +++ b/configure @@ -474,7 +474,7 @@ modules=3D"no" module_upgrades=3D"no" prefix=3D"/usr/local" firmwarepath=3D"\${prefix}/share/qemu-firmware" -qemu_suffix=3D"/qemu" +qemu_suffix=3D"qemu" slirp=3D"" oss_lib=3D"" bsd=3D"no" @@ -1832,12 +1832,12 @@ Advanced options (experts only): --with-git=3DGIT use specified git [$git] --static enable static build [$static] --mandir=3DPATH install man pages in PATH - --datadir=3DPATH install firmware in PATH$qemu_suffix - --docdir=3DPATH install documentation in PATH$qemu_suffix + --datadir=3DPATH install firmware in PATH/$qemu_suffix + --docdir=3DPATH install documentation in PATH/$qemu_suffix --bindir=3DPATH install binaries in PATH --libdir=3DPATH install libraries in PATH --libexecdir=3DPATH install helper binaries in PATH - --sysconfdir=3DPATH install config in PATH$qemu_suffix + --sysconfdir=3DPATH install config in PATH/$qemu_suffix --localstatedir=3DPATH install local state in PATH (set at runtime o= n win32) --firmwarepath=3DPATH search PATH for firmware files --efi-aarch64=3DPATH PATH of efi file to use for aarch64 VMs. @@ -6449,9 +6449,9 @@ EOF fi fi =20 -qemu_confdir=3D$sysconfdir$qemu_suffix -qemu_moddir=3D$libdir$qemu_suffix -qemu_datadir=3D$datadir$qemu_suffix +qemu_confdir=3D"$sysconfdir/$qemu_suffix" +qemu_moddir=3D"$libdir/$qemu_suffix" +qemu_datadir=3D"$datadir/$qemu_suffix" qemu_localedir=3D"$datadir/locale" qemu_icondir=3D"$datadir/icons" qemu_desktopdir=3D"$datadir/applications" --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598951945; cv=none; d=zohomail.com; s=zohoarc; b=PDk/9FT4oQJU4zKSKQ0XLQY7UtFHcSfmTyGlwNXnsBWWmDYqbA9LrUdzOuTL2tZC3iGkrPTTD/kLlW0D4LZcJTYeDMDmwdsDMaM0u6kjZNG612NMh8/h33ROY+3aDU7TJOL1c14pCTicDVWB4VwoBNwXeqWrXWiIGOXFNHvWJBg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598951945; 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=Lb++fk3K4xHMFs7zN+DXo9G1JXSGmWiksVzN1SENzT0=; b=bsW1ERtbkMDv754a4Xa1GS/Z6xnb/T16iNz8IOw6EnfYtlMCswPQohiQsih21NO36ZkTwSu+55qtlAbAys1U7PCH8IkH8EtF/QTNhd8JJACiQ2KZmQ2gH4BRJdfEoOO9ByGjXkGIqgp+oCfhK5idOLS1tB1Esz7XoqrQexI/szs= 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 1598951945594185.3460439651933; Tue, 1 Sep 2020 02:19:05 -0700 (PDT) Received: from localhost ([::1]:54814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2RU-0000vi-No for importer@patchew.org; Tue, 01 Sep 2020 05:19:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KS-0003U3-9s for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:48 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:49852) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD2KP-0006qn-4h for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:47 -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-132-SAqrvGiQMviNhrIEm-fIPg-1; Tue, 01 Sep 2020 05:11:42 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7250751B6 for ; Tue, 1 Sep 2020 09:11:41 +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 2450460C04; Tue, 1 Sep 2020 09:11:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951504; 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=Lb++fk3K4xHMFs7zN+DXo9G1JXSGmWiksVzN1SENzT0=; b=J/klQqvYoQFRQ7mAFSedvrY6YELqbpPuHjOWfDsbiDqbL9j+l3b01zEWe7/ciuXTepd6D1 efKfoNPU18lUYPKDKfl62WpCJx8eOVwSL7s4p+1XRtTrksHOcsSqLkLSTHHsTQcevKXtZf 25C41T51XIaA5SBH4W23/qevGZE9UyM= X-MC-Unique: SAqrvGiQMviNhrIEm-fIPg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 13/24] configure: build docdir like other suffixed directories Date: Tue, 1 Sep 2020 05:11:21 -0400 Message-Id: <20200901091132.29601-14-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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/31 23:17:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau As documented in --help for --docdir. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200826110419.528931-4-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 66d7a72aa9..625b7ba062 100755 --- a/configure +++ b/configure @@ -1684,14 +1684,14 @@ includedir=3D"${includedir:-$prefix/include}" if test "$mingw32" =3D "yes" ; then mandir=3D"$prefix" datadir=3D"$prefix" - qemu_docdir=3D"$prefix" + docdir=3D"$prefix" bindir=3D"$prefix" sysconfdir=3D"$prefix" local_statedir=3D else mandir=3D"${mandir:-$prefix/share/man}" datadir=3D"${datadir:-$prefix/share}" - qemu_docdir=3D"${qemu_docdir:-$prefix/share/doc/qemu}" + docdir=3D"${docdir:-$prefix/share/doc}" bindir=3D"${bindir:-$prefix/bin}" sysconfdir=3D"${sysconfdir:-$prefix/etc}" local_statedir=3D"${local_statedir:-$prefix/var}" @@ -1841,7 +1841,7 @@ Advanced options (experts only): --localstatedir=3DPATH install local state in PATH (set at runtime o= n win32) --firmwarepath=3DPATH search PATH for firmware files --efi-aarch64=3DPATH PATH of efi file to use for aarch64 VMs. - --with-suffix=3DSUFFIX suffix for QEMU data inside datadir/libdir/sy= sconfdir [$qemu_suffix] + --with-suffix=3DSUFFIX suffix for QEMU data inside datadir/libdir/sy= sconfdir/docdir [$qemu_suffix] --with-pkgversion=3DVERS use specified string as sub-version of the pa= ckage --enable-debug enable common debug build options --enable-sanitizers enable default sanitizers @@ -6452,6 +6452,7 @@ fi qemu_confdir=3D"$sysconfdir/$qemu_suffix" qemu_moddir=3D"$libdir/$qemu_suffix" qemu_datadir=3D"$datadir/$qemu_suffix" +qemu_docdir=3D"$docdir/$qemu_suffix" qemu_localedir=3D"$datadir/locale" qemu_icondir=3D"$datadir/icons" qemu_desktopdir=3D"$datadir/applications" --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598951865; cv=none; d=zohomail.com; s=zohoarc; b=e+mhcTXl6144XqnTeLivb/IAXOBIghRXrX7fKs9K3KVIU9cNtkLxWLsxvZzG4VERr+JeZA4acxdUWb9NNgbt0h6DLaaEmQautRkgvdEkj1Wr8pHxflvgm8iw+VRpS7DaaJy5NCH9IsnYJtyM382lWaxo2gyVla9Ow1BEN2Lhv+g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598951865; 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=8lRuyqBRRx9de8tU71gvMb6kOFpE7+80jmUF1LJ8ULY=; b=OtPT/0hqKSw+Cv4VjaYI5GZaNm4A2yVGZmbKVZ19Lx52LGwQte5PfifLBnaaJRC/k/XljnbKL/vlUP6WMovAnm16luSfboikZCDZTk5Bd/+GThlXB6Kyn52iUQo+W46QeqzvC62pUFWvz0VJv4itjSP8INeK1zQ+N3/dRKqyr50= 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 1598951865284623.3309920923778; Tue, 1 Sep 2020 02:17:45 -0700 (PDT) Received: from localhost ([::1]:48050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2QC-0006gE-9T for importer@patchew.org; Tue, 01 Sep 2020 05:17:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33732) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KQ-0003Pg-Rk for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:46 -0400 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:47845 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 1kD2KP-0006qm-3U for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:46 -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-152-g3PQQ7GhPM2PnqX1UssQ_w-1; Tue, 01 Sep 2020 05:11:42 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E172218A2243 for ; Tue, 1 Sep 2020 09:11:41 +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 936B160C04; Tue, 1 Sep 2020 09:11:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951504; 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=8lRuyqBRRx9de8tU71gvMb6kOFpE7+80jmUF1LJ8ULY=; b=ArgmQh+tshbbWcuvoGMGDfONLplt2UvqARQCY0xvcPAMbB502lP0en5JASWLWhFr2yMMAg vLFXT+ftEtrCXJXUlxLG5pDG6Ulmb5MepSAnVZXzS92/UmgTdvmWG54xrunIfKmS2sT+GS tJP/pJMBfbcWCHZDJGNsGlETtTCiRyY= X-MC-Unique: g3PQQ7GhPM2PnqX1UssQ_w-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/24] meson: pass qemu_suffix option Date: Tue, 1 Sep 2020 05:11:22 -0400 Message-Id: <20200901091132.29601-15-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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.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/31 23:17:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau The following patches will make use of it to fix installation paths. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200826110419.528931-5-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 1 + meson_options.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/configure b/configure index 625b7ba062..78aae9c2a0 100755 --- a/configure +++ b/configure @@ -8198,6 +8198,7 @@ NINJA=3D${ninja:-$PWD/ninjatool} $meson setup \ --mandir "${pre_prefix}$mandir" \ --sysconfdir "${pre_prefix}$sysconfdir" \ --localstatedir "${pre_prefix}$local_statedir" \ + -Dqemu_suffix=3D"$qemu_suffix" \ -Doptimization=3D$(if test "$debug" =3D yes; then echo 0; else ech= o 2; fi) \ -Ddebug=3D$(if test "$debug_info" =3D yes; then echo true; else ec= ho false; fi) \ -Dwerror=3D$(if test "$werror" =3D yes; then echo true; else echo = false; fi) \ diff --git a/meson_options.txt b/meson_options.txt index aef2de6523..dfdcf85063 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,5 @@ +option('qemu_suffix', type : 'string', value: '/qemu', + description: 'Suffix for QEMU data/modules/config directories (can = be empty)') option('gettext', type : 'boolean', value : true) option('sdl', type : 'feature', value : 'auto') option('sdl_image', type : 'feature', value : 'auto') --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598952102; cv=none; d=zohomail.com; s=zohoarc; b=lKMhonUnU1a7PaIni0U430gyjGPTOSNsNqPaS9c5RLVCLHWVGmV69Rblv5bCnVuG1JQOJ3a6W5M/wcp+/LGA11rESTDiUW21yR7YsKRBitvZdD4qHXXaUy4bCBo4a2TZFYrCgDkb2Cq42qa9o8j/sayb+VDoVm5vLSaq+2f0wJU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598952102; 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=CHD/T/2GtcjdtrkJkCuvpJR9JYXGP04bZaW+yoSYPLU=; b=YOoYYZd1rZ4R8oNTEJ+ZRnPRC8gl4jq1yA+cljQIBukZxv1SE0jkIzthYcGOYM86ZfvaLWkkrWBV7lXV95VNpfPO39rvNsb8iOhJN6Ml326QlZxHJVKuIODn79vaOKCnD5YkLYq4B4YShEcFz2hMwNg3XN+hi7EDim5LTtPs9Gs= 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 1598952102630536.4900407888105; Tue, 1 Sep 2020 02:21:42 -0700 (PDT) Received: from localhost ([::1]:37462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2U1-0005Mn-Q6 for importer@patchew.org; Tue, 01 Sep 2020 05:21:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33854) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KZ-0003lM-3F for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:55 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:24641 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 1kD2KX-0006sY-8t for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:54 -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-183-wGdiUIVnNRCT4FkSV8lq9g-1; Tue, 01 Sep 2020 05:11:43 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5CAD4801FDE for ; Tue, 1 Sep 2020 09:11:42 +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 0E7B160C04; Tue, 1 Sep 2020 09:11:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951512; 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=CHD/T/2GtcjdtrkJkCuvpJR9JYXGP04bZaW+yoSYPLU=; b=N+x/ePEDQSh5aUbeDsgxye65ZUfgGIQseJ85LI2dYyhJON240QMFrxcycZ1k0UdWRX43+S jqyLLbd8WzOSC0bGIieuvMwNXdkRIhqYEIvr4K+9hIVCIksD6oQ+nfjuRzjkB1JDtwEi0V yFrQZurMwMKSNg5CN/2KnbqhKGAxCzQ= X-MC-Unique: wGdiUIVnNRCT4FkSV8lq9g-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 15/24] meson: use meson datadir instead of qemu_datadir Date: Tue, 1 Sep 2020 05:11:23 -0400 Message-Id: <20200901091132.29601-16-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=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/09/01 00:57:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau When cross-compiling, by default qemu_datadir is 'c:\Program Files\QEMU', which is not recognized as being an absolute path, and meson will end up adding the prefix again. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200826110419.528931-6-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- contrib/vhost-user-gpu/meson.build | 2 +- meson.build | 3 ++- meson_options.txt | 2 +- pc-bios/descriptors/meson.build | 2 +- pc-bios/keymaps/meson.build | 6 +++--- pc-bios/meson.build | 2 +- tools/virtiofsd/meson.build | 2 +- trace/meson.build | 2 +- 8 files changed, 11 insertions(+), 10 deletions(-) diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/me= son.build index 12d608c2e7..7d9b29da8b 100644 --- a/contrib/vhost-user-gpu/meson.build +++ b/contrib/vhost-user-gpu/meson.build @@ -10,5 +10,5 @@ if 'CONFIG_TOOLS' in config_host and 'CONFIG_VIRGL' in co= nfig_host \ configure_file(input: '50-qemu-gpu.json.in', output: '50-qemu-gpu.json', configuration: config_host, - install_dir: config_host['qemu_datadir'] / 'vhost-user') + install_dir: qemu_datadir / 'vhost-user') endif diff --git a/meson.build b/meson.build index 8b28ecff28..bf6d1b3153 100644 --- a/meson.build +++ b/meson.build @@ -18,6 +18,7 @@ config_all_disas =3D keyval.load(meson.current_build_dir(= ) / 'config-all-disas.mak enable_modules =3D 'CONFIG_MODULES' in config_host enable_static =3D 'CONFIG_STATIC' in config_host build_docs =3D 'BUILD_DOCS' in config_host +qemu_datadir =3D get_option('datadir') / get_option('qemu_suffix') config_host_data =3D configuration_data() genh =3D [] =20 @@ -1055,7 +1056,7 @@ foreach target : target_dirs output: exe['name'] + stp['ext'], capture: true, install: stp['install'], - install_dir: config_host['qemu_datadir'] / '../syste= mtap/tapset', + install_dir: qemu_datadir / '../systemtap/tapset', command: [ tracetool, '--group=3Dall', '--format=3D' + stp['f= mt'], '--binary=3D' + stp['bin'], diff --git a/meson_options.txt b/meson_options.txt index dfdcf85063..f4275691bd 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,4 @@ -option('qemu_suffix', type : 'string', value: '/qemu', +option('qemu_suffix', type : 'string', value: 'qemu', description: 'Suffix for QEMU data/modules/config directories (can = be empty)') option('gettext', type : 'boolean', value : true) option('sdl', type : 'feature', value : 'auto') diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.bu= ild index 7c715bace8..3798d32372 100644 --- a/pc-bios/descriptors/meson.build +++ b/pc-bios/descriptors/meson.build @@ -10,5 +10,5 @@ foreach f: [ output: f, configuration: {'DATADIR': config_host['qemu_datadir']}, install: install_blobs, - install_dir: config_host['qemu_datadir'] / 'firmware') + install_dir: qemu_datadir / 'firmware') endforeach diff --git a/pc-bios/keymaps/meson.build b/pc-bios/keymaps/meson.build index b737c82230..bbac83ece3 100644 --- a/pc-bios/keymaps/meson.build +++ b/pc-bios/keymaps/meson.build @@ -44,13 +44,13 @@ foreach km, args: keymaps build_by_default: true, output: km, command: [native_qemu_keymap, '-f', '@OUTPUT@', args.= split()], - install_dir: config_host['qemu_datadir'] / 'keymaps') + install_dir: qemu_datadir / 'keymaps') endforeach if t.length() > 0 alias_target('update-keymaps', t) else # install from the source tree - install_data(keymaps.keys(), install_dir: config_host['qemu_datadir'] / = 'keymaps') + install_data(keymaps.keys(), install_dir: qemu_datadir / 'keymaps') endif =20 -install_data(['sl', 'sv'], install_dir: config_host['qemu_datadir'] / 'key= maps') +install_data(['sl', 'sv'], install_dir: qemu_datadir / 'keymaps') diff --git a/pc-bios/meson.build b/pc-bios/meson.build index f608c2cdba..8087e5c0a7 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -19,7 +19,7 @@ if 'DECOMPRESS_EDK2_BLOBS' in config_host input: '@0@.bz2'.format(f), capture: true, install: install_blobs, - install_dir: config_host['qemu_datadir'], + install_dir: qemu_datadir, command: [ bzip2, '-dc', '@INPUT0@' ]) endforeach endif diff --git a/tools/virtiofsd/meson.build b/tools/virtiofsd/meson.build index d1e23c5760..50022ed89e 100644 --- a/tools/virtiofsd/meson.build +++ b/tools/virtiofsd/meson.build @@ -16,4 +16,4 @@ executable('virtiofsd', files( configure_file(input: '50-qemu-virtiofsd.json.in', output: '50-qemu-virtiofsd.json', configuration: config_host, - install_dir: config_host['qemu_datadir'] / 'vhost-user') + install_dir: qemu_datadir / 'vhost-user') diff --git a/trace/meson.build b/trace/meson.build index 1c1fb31a61..b36937d3a6 100644 --- a/trace/meson.build +++ b/trace/meson.build @@ -58,7 +58,7 @@ trace_events_all =3D custom_target('trace-events-all', command: [ 'cat', '@INPUT@' ], capture: true, install: true, - install_dir: config_host['qemu_datadir']) + install_dir: qemu_datadir) =20 foreach d : [ ['generated-tcg-tracers.h', 'tcg-h'], --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598952102; cv=none; d=zohomail.com; s=zohoarc; b=cFNTfkPSYfdem4fvSq1xcB3bZurqbj1aLzzmE7x7+dxRuUZnjcSuDoOJcy5Vvr84f7ZFe01EZJxQ/1gPKcIxGkefmBy4u5ke3kZwxORV42YQXFQgmlgVjFkFPE2zAPlEZRX4YRLeLaz9U+Z7G4gB27TJWUof9XbaYncgRf346NY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598952102; 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=3Q/ZAsSwM+WifqfwQlCrXnImFd901hQ55k1t7JbU36Q=; b=gVTB6m5+U4tkghlD/SpG7djS/GGFXr+DxpFR2yaSxDg+m0eO7Ctx3W3pHb/WQJ/5IUjtVQX9IdJC0gTYaZkWQFZnxz+OYPrEPNabyR9q4C7sjVLj+ySXFa5h3sSaNgZWzpvs8RaXqAFTzmu7UTm83HzYcPEcrbWciAjAzgBdgxY= 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 1598952102235904.310960424155; Tue, 1 Sep 2020 02:21:42 -0700 (PDT) Received: from localhost ([::1]:37404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2U1-0005LT-Ep for importer@patchew.org; Tue, 01 Sep 2020 05:21:41 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33794) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KT-0003Xp-Jw for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:49 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:52831 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 1kD2KR-0006rS-LF for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:49 -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-185-8hIEIB2gMzSakQeNw7WkaQ-1; Tue, 01 Sep 2020 05:11:43 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CC3CF801AE2 for ; Tue, 1 Sep 2020 09:11:42 +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 7D73B60C04; Tue, 1 Sep 2020 09:11:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951507; 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=3Q/ZAsSwM+WifqfwQlCrXnImFd901hQ55k1t7JbU36Q=; b=f0hZRf7xg4XHPm4EBhPQTY+PTRddLeuSCMoElu2JfB1Lcz3HYpZrhBbHQL/+Mwu0Q9pO8J E+RmsIjJVMymZouB6WvFu0AikhV6GI6CFOKkOKZ8uYpS/uuLXwOoJsqRpfxQ7T667g62KE 09P1dtcPSfRm1UlPo/vd7p+PMF1rjqY= X-MC-Unique: 8hIEIB2gMzSakQeNw7WkaQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 16/24] meson: pass docdir option Date: Tue, 1 Sep 2020 05:11:24 -0400 Message-Id: <20200901091132.29601-17-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=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/09/01 00:57:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau When cross-compiling, by default qemu_docdir is 'c:\Program Files\QEMU\' which is not recognized as being an absolute path, and meson will end up adding the prefix again. Add an option to pass docdir location to meson, pre-prefixed like we do with other directories, build qemu_docdir with the common suffix and use that instead of config_host['qemu_docdir']. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200826110419.528931-7-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 2 +- docs/meson.build | 4 ++-- meson.build | 4 +++- meson_options.txt | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 78aae9c2a0..1f478a46a9 100755 --- a/configure +++ b/configure @@ -6653,7 +6653,6 @@ echo "sysconfdir=3D$sysconfdir" >> $config_host_mak echo "qemu_confdir=3D$qemu_confdir" >> $config_host_mak echo "qemu_datadir=3D$qemu_datadir" >> $config_host_mak echo "qemu_firmwarepath=3D$firmwarepath" >> $config_host_mak -echo "qemu_docdir=3D$qemu_docdir" >> $config_host_mak echo "qemu_moddir=3D$qemu_moddir" >> $config_host_mak if test "$mingw32" =3D "no" ; then echo "qemu_localstatedir=3D$local_statedir" >> $config_host_mak @@ -8198,6 +8197,7 @@ NINJA=3D${ninja:-$PWD/ninjatool} $meson setup \ --mandir "${pre_prefix}$mandir" \ --sysconfdir "${pre_prefix}$sysconfdir" \ --localstatedir "${pre_prefix}$local_statedir" \ + -Ddocdir=3D"${pre_prefix}$docdir" \ -Dqemu_suffix=3D"$qemu_suffix" \ -Doptimization=3D$(if test "$debug" =3D yes; then echo 0; else ech= o 2; fi) \ -Ddebug=3D$(if test "$debug_info" =3D yes; then echo true; else ec= ho false; fi) \ diff --git a/docs/meson.build b/docs/meson.build index 8b059a8e39..50f367349b 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -10,7 +10,7 @@ if build_docs configure_file(output: 'index.html', input: files('index.html.in'), configuration: {'VERSION': meson.project_version()}, - install_dir: config_host['qemu_docdir']) + install_dir: qemu_docdir) manuals =3D [ 'devel', 'interop', 'tools', 'specs', 'system', 'user' ] man_pages =3D { 'interop' : { @@ -48,7 +48,7 @@ if build_docs input_dir, output_dir]) sphinxdocs +=3D this_manual if build_docs and manual !=3D 'devel' - install_subdir(output_dir, install_dir: config_host['qemu_docdir']) + install_subdir(output_dir, install_dir: qemu_docdir) endif =20 these_man_pages =3D [] diff --git a/meson.build b/meson.build index bf6d1b3153..43e2c6e43d 100644 --- a/meson.build +++ b/meson.build @@ -19,6 +19,7 @@ enable_modules =3D 'CONFIG_MODULES' in config_host enable_static =3D 'CONFIG_STATIC' in config_host build_docs =3D 'BUILD_DOCS' in config_host qemu_datadir =3D get_option('datadir') / get_option('qemu_suffix') +qemu_docdir =3D get_option('docdir') / get_option('qemu_suffix') config_host_data =3D configuration_data() genh =3D [] =20 @@ -1182,7 +1183,7 @@ if build_docs input: input, output: output, install: true, - install_dir: config_host['qemu_docdir'] / 'interop', + install_dir: qemu_docdir / 'interop', command: cmd + args) endforeach alias_target(ext, t) @@ -1245,6 +1246,7 @@ if targetos !=3D 'windows' else summary_info +=3D {'local state directory': 'queried at runtime'} endif +summary_info +=3D {'Doc directory': get_option('docdir')} summary_info +=3D {'Build directory': meson.current_build_dir()} summary_info +=3D {'Source path': meson.current_source_dir()} summary_info +=3D {'GIT binary': config_host['GIT']} diff --git a/meson_options.txt b/meson_options.txt index f4275691bd..c3120fa359 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,5 +1,7 @@ option('qemu_suffix', type : 'string', value: 'qemu', description: 'Suffix for QEMU data/modules/config directories (can = be empty)') +option('docdir', type : 'string', value : 'doc', + description: 'Base directory for documentation installation (can be= empty)') option('gettext', type : 'boolean', value : true) option('sdl', type : 'feature', value : 'auto') option('sdl_image', type : 'feature', value : 'auto') --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598952015; cv=none; d=zohomail.com; s=zohoarc; b=Hb+tznPftwxOUIag2vpgSO/npY2mofxWA5yqrXKdMLbwi7PIFyjy0HuHqPKv6av/b9WSEFnu39mJHxnW0a7ciw++mqKJips9ZiQAlMpjhI3BzTFuXIf5ZfUM+trnHC3BDqK62k4aXtwIpJ5czdArvHtVZuD1TP0J7swifnCqhNg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598952015; 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=YkZluKnU2LEONvXRPML5K7fgPraIgH8Jah/pV85hiIU=; b=nayhflq2GsEQXmGgLq4xvN7Sv/II1phFiwD3XOQE9DAcJ0ynOKcsqiVYDFnlBTa4w+jtDuxdBOIZ2kzjTGkkev0Zt+wFjmkqKLjLmFNzobKIR0PxngAM/2Aq5tXaRvm1grZjO0Izy6QjuShbxkZuYf75InFkF5Uey1OSIFezs9c= 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 1598952015930388.6613590565619; Tue, 1 Sep 2020 02:20:15 -0700 (PDT) Received: from localhost ([::1]:60808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2Sd-0003Iz-3k for importer@patchew.org; Tue, 01 Sep 2020 05:20:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KT-0003W0-07 for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:49 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:53118 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 1kD2KR-0006rH-4T for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:48 -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-501-pTlvUROINMWTdgiWdotRkA-1; Tue, 01 Sep 2020 05:11:44 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 5971D51B4 for ; Tue, 1 Sep 2020 09:11:43 +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 ED3B961177; Tue, 1 Sep 2020 09:11:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951505; 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=YkZluKnU2LEONvXRPML5K7fgPraIgH8Jah/pV85hiIU=; b=L6m1T7C43mKlLjZAevEJBBn0nz8itfQ92XWzlU7VHsSxGFynkREdr9kE0J07NrALnMTrRs aDb8EAQZ/e1jSdBr5ujP4AxIIEt9E+EhpJz68UBA6jPZKHcVo4qyVUGSIdd/dkKt5CK2jv xTmP7920CC7LPEFq8eiJP8GM82qChls= X-MC-Unique: pTlvUROINMWTdgiWdotRkA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 17/24] meson: use meson mandir instead of qemu_mandir Date: Tue, 1 Sep 2020 05:11:25 -0400 Message-Id: <20200901091132.29601-18-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=207.211.31.81; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/01 02:08:15 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau When cross-compiling, by default qemu_mandir is 'c:\Program Files\QEMU', which is not recognized as being an absolute path, and meson will end up adding the prefix again. Use the pre-prefixed meson mandir option instead. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20200826110419.528931-8-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- configure | 1 - meson.build | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 1f478a46a9..b9e977f13d 100755 --- a/configure +++ b/configure @@ -6648,7 +6648,6 @@ echo "bindir=3D$bindir" >> $config_host_mak echo "libdir=3D$libdir" >> $config_host_mak echo "libexecdir=3D$libexecdir" >> $config_host_mak echo "includedir=3D$includedir" >> $config_host_mak -echo "mandir=3D$mandir" >> $config_host_mak echo "sysconfdir=3D$sysconfdir" >> $config_host_mak echo "qemu_confdir=3D$qemu_confdir" >> $config_host_mak echo "qemu_datadir=3D$qemu_datadir" >> $config_host_mak diff --git a/meson.build b/meson.build index 43e2c6e43d..a71b199c5e 100644 --- a/meson.build +++ b/meson.build @@ -1223,7 +1223,7 @@ if build_docs output: man, capture: true, install: true, - install_dir: config_host['mandir'] / 'man7', + install_dir: get_option('mandir') / 'man7', command: [pod2man, '--utf8', '--section=3D7', '-= -center=3D" "', '--release=3D" "', '@INPUT@']) endforeach @@ -1242,7 +1242,7 @@ summary_info +=3D {'include directory': config_host['= includedir']} summary_info +=3D {'config directory': config_host['sysconfdir']} if targetos !=3D 'windows' summary_info +=3D {'local state directory': config_host['qemu_localstate= dir']} - summary_info +=3D {'Manual directory': config_host['mandir']} + summary_info +=3D {'Manual directory': get_option('mandir')} else summary_info +=3D {'local state directory': 'queried at runtime'} endif --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598951945; cv=none; d=zohomail.com; s=zohoarc; b=dpcoQjT242j7rrHg7DfdM5ClTHRw+2YCeeGgG0dMVuaGoxm2i8ZzwNoXWGyNRZBT6W9gqB66N3KnpqMb9WNaNr46x8dJBC3U9LNoVma2n4lIUNHGdTXtsligiUnuuw00arRgMfbuR2BV7CJq4viKRBr20W3/A1CVND0bI23qJu8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598951945; 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=N2tDKhwKMD31mzcJvpyGf7i3OTOQs+IVoyp/Lpwz2/E=; b=GMEzz1tiLSIMmwL9MacLe/pILLY3jUDROHFw+ZbVu8jnYcx/r8WuJNF+6q05RmcBHsbSnExBQ9gQEuTfh+LNBzGcxOdPlrKf2p+H/u89lwwSO6CTX40UQ/QaFMo4X5XQUGtivQ6+yDkXuwSU56Gtteld9AWGCv/ZQc66/wxPxQM= 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 15989519457781005.4310582674926; Tue, 1 Sep 2020 02:19:05 -0700 (PDT) Received: from localhost ([::1]:54820 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2RU-0000vq-Vx for importer@patchew.org; Tue, 01 Sep 2020 05:19:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2Ka-0003oh-E9 for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:56 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:27680 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 1kD2KY-0006sf-DW for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:56 -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-144-GOLQunEnMzCzXxNlVtD5ZQ-1; Tue, 01 Sep 2020 05:11:44 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DCC1D800C60 for ; Tue, 1 Sep 2020 09:11:43 +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 7ABF1672C6; Tue, 1 Sep 2020 09:11:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951513; 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=N2tDKhwKMD31mzcJvpyGf7i3OTOQs+IVoyp/Lpwz2/E=; b=LTQ/I+w6xgrQewhx14UduUb++ozhHVrnA4fAuJ+hO4ygI6mGZP6b/qhrncl+zl/47T0wg5 22Le8d6wKuK1/A46qAkGzsQl4juQV+7QU5/BWMczmOu8Iv0AeGtzNCoqQ70p5I+6lkEtbK kQBRD0RvkIJ+JLRVuStp0vwyAd7A1gA= X-MC-Unique: GOLQunEnMzCzXxNlVtD5ZQ-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 18/24] meson: add NSIS building Date: Tue, 1 Sep 2020 05:11:26 -0400 Message-Id: <20200901091132.29601-19-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=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/09/01 05:11:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20200826110419.528931-9-marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini --- Makefile | 56 ----------------------------------- meson.build | 25 ++++++++++++++++ scripts/nsis.py | 78 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 56 deletions(-) create mode 100644 scripts/nsis.py diff --git a/Makefile b/Makefile index 75db8be52e..f187ddf47a 100644 --- a/Makefile +++ b/Makefile @@ -232,62 +232,6 @@ distclean: clean ninja-distclean # Needed by "meson install" export DESTDIR =20 -ifdef CONFIG_WIN32 - -INSTALLER =3D qemu-setup-$(VERSION)$(EXESUF) - -nsisflags =3D -V2 -NOCD - -ifneq ($(wildcard $(SRC_PATH)/dll),) -ifeq ($(ARCH),x86_64) -# 64 bit executables -DLL_PATH =3D $(SRC_PATH)/dll/w64 -nsisflags +=3D -DW64 -else -# 32 bit executables -DLL_PATH =3D $(SRC_PATH)/dll/w32 -endif -endif - -.PHONY: installer -installer: $(INSTALLER) - -INSTDIR=3D/tmp/qemu-nsis - -$(INSTALLER): $(SRC_PATH)/qemu.nsi - $(MAKE) install DESTDIR=3D${INSTDIR} -ifdef SIGNCODE - (cd ${INSTDIR}/${bindir}; \ - for i in *.exe; do \ - $(SIGNCODE) $${i}; \ - done \ - ) -endif # SIGNCODE - (cd ${INSTDIR}/${bindir}; \ - for i in qemu-system-*.exe; do \ - arch=3D$${i%.exe}; \ - arch=3D$${arch#qemu-system-}; \ - echo Section \"$$arch\" Section_$$arch; \ - echo SetOutPath \"\$$INSTDIR\"; \ - echo File \"\$${BINDIR}\\$$i\"; \ - echo SectionEnd; \ - done \ - ) >${INSTDIR}/${bindir}/system-emulations.nsh - makensis $(nsisflags) \ - $(if $(BUILD_DOCS),-DCONFIG_DOCUMENTATION=3D"y") \ - $(if $(CONFIG_GTK),-DCONFIG_GTK=3D"y") \ - -DBINDIR=3D"${INSTDIR}/${bindir}" \ - $(if $(DLL_PATH),-DDLLDIR=3D"$(DLL_PATH)") \ - -DSRCDIR=3D"$(SRC_PATH)" \ - -DOUTFILE=3D"$(INSTALLER)" \ - -DDISPLAYVERSION=3D"$(VERSION)" \ - $(SRC_PATH)/qemu.nsi - rm -r ${INSTDIR} -ifdef SIGNCODE - $(SIGNCODE) $(INSTALLER) -endif # SIGNCODE -endif # CONFIG_WIN - # Add a dependency on the generated files, so that they are always # rebuilt before other object files ifneq ($(wildcard config-host.mak),) diff --git a/meson.build b/meson.build index a71b199c5e..78ac86f3a1 100644 --- a/meson.build +++ b/meson.build @@ -1230,6 +1230,31 @@ if build_docs endif endif =20 +if host_machine.system() =3D=3D 'windows' + nsis_cmd =3D [ + find_program('scripts/nsis.py'), + '@OUTPUT@', + get_option('prefix'), + meson.current_source_dir(), + host_machine.cpu_family(), + '--', + '-DDISPLAYVERSION=3D' + meson.project_version(), + ] + if build_docs + nsis_cmd +=3D '-DCONFIG_DOCUMENTATION=3Dy' + endif + if 'CONFIG_GTK' in config_host + nsis_cmd +=3D '-DCONFIG_GTK=3Dy' + endif + + nsis =3D custom_target('nsis', + output: 'qemu-setup-' + meson.project_version() + '= .exe', + input: files('qemu.nsi'), + build_always_stale: true, + command: nsis_cmd + ['@INPUT@']) + alias_target('installer', nsis) +endif + summary_info =3D {} summary_info +=3D {'Install prefix': config_host['prefix']} summary_info +=3D {'BIOS directory': config_host['qemu_datadir']} diff --git a/scripts/nsis.py b/scripts/nsis.py new file mode 100644 index 0000000000..e1c409344e --- /dev/null +++ b/scripts/nsis.py @@ -0,0 +1,78 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2020 Red Hat, Inc. +# +# SPDX-License-Identifier: GPL-2.0-or-later + +import argparse +import glob +import os +import shutil +import subprocess +import tempfile + + +def signcode(path): + cmd =3D os.environ.get("SIGNCODE") + if not cmd: + return + subprocess.run([cmd, path]) + + +def main(): + parser =3D argparse.ArgumentParser(description=3D"QEMU NSIS build help= er.") + parser.add_argument("outfile") + parser.add_argument("prefix") + parser.add_argument("srcdir") + parser.add_argument("cpu") + parser.add_argument("nsisargs", nargs=3D"*") + args =3D parser.parse_args() + + destdir =3D tempfile.mkdtemp() + try: + subprocess.run(["make", "install", "DESTDIR=3D" + destdir + os.pat= h.sep]) + with open( + os.path.join(destdir + args.prefix, "system-emulations.nsh"), = "w" + ) as nsh: + for exe in glob.glob( + os.path.join(destdir + args.prefix, "qemu-system-*.exe") + ): + exe =3D os.path.basename(exe) + arch =3D exe[12:-4] + nsh.write( + """ + Section "{0}" Section_{0} + SetOutPath "$INSTDIR" + File "${{BINDIR}}\\{1}" + SectionEnd + """.format( + arch, exe + ) + ) + + for exe in glob.glob(os.path.join(destdir + args.prefix, "*.exe")): + signcode(exe) + + makensis =3D [ + "makensis", + "-V2", + "-NOCD", + "-DSRCDIR=3D" + args.srcdir, + "-DBINDIR=3D" + destdir + args.prefix, + ] + dlldir =3D "w32" + if args.cpu =3D=3D "x86_64": + dlldir =3D "w64" + makensis +=3D ["-DW64"] + if os.path.exists(os.path.join(args.srcdir, "dll")): + makensis +=3D "-DDLLDIR=3D{0}/dll/{1}".format(args.srcdir, dll= dir) + + makensis +=3D ["-DOUTFILE=3D" + args.outfile] + args.nsisargs + subprocess.run(makensis) + signcode(args.outfile) + finally: + shutil.rmtree(destdir) + + +if __name__ =3D=3D "__main__": + main() --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598952184; cv=none; d=zohomail.com; s=zohoarc; b=NVT8yA0wRrIUimCSS+8zAGMLroSy4LqNPZOdu0bB8I1Tit7owpOVQT4sQkQbLDJnQxDU94iVej4dA9UwRtb+ABD0w5LFJ38wuGc5vwHfktRN3/bo2oNDUdB+9wal+M5OFWohrMHRnUw5FU86crnEYtlflB1OUBsCcgKJkznAyDE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598952184; 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=SS7UzYxCuAM3WMcYx2kQyUu/3R3z0wH9W4LFY3cUX2A=; b=C8sfryqG+FUyE5vJl7nUWmJLtVBp3E+UPco40tgdUvZq1BbNrUpnYroYoXmAYLIQKSHrg0ZOqxZ0YORYS0GJ1tD3xNKn3ndh3qzRrFUjpNftAEaQFXkQJvYgP8+bONb8NDYAEyCvz3EWHse4outiOEfEbZ6Uv3/kh0epqiewFLc= 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 1598952184383634.450802999994; Tue, 1 Sep 2020 02:23:04 -0700 (PDT) Received: from localhost ([::1]:42098 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2VK-0007Ek-P6 for importer@patchew.org; Tue, 01 Sep 2020 05:23:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33802) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KU-0003ZJ-3b for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:50 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:54142 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 1kD2KS-0006rZ-EU for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:49 -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-409-sKrs5gyuPmmv2OkMiHfnSg-1; Tue, 01 Sep 2020 05:11:45 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8F0298015C5; Tue, 1 Sep 2020 09:11:44 +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 09C7F672CD; Tue, 1 Sep 2020 09:11:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951507; 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=SS7UzYxCuAM3WMcYx2kQyUu/3R3z0wH9W4LFY3cUX2A=; b=f4BmHUMti0LnySfzRi9AxM7G/0dHR9mL/Wmbj9KC6fb7Pz62t8ouvmnCvvenv9g0eD0M3Y +/lIWWy8Tq3FvPvI7xB5GRFId3skbeyW45RZoGUJWd/LqIdDhzOJYrX5KQBDoiLXcjxpBx nzNVdBeuB26GMuJTRtEgwrmBNlTRwNk= X-MC-Unique: sKrs5gyuPmmv2OkMiHfnSg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 19/24] meson: add pixman dependency to chardev/baum module Date: Tue, 1 Sep 2020 05:11:27 -0400 Message-Id: <20200901091132.29601-20-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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/09/01 00:57:59 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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: Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) From: Stefan Weil Signed-off-by: Stefan Weil Reviewed-by: Philippe Mathieu-Daud=C3=A9 Message-Id: <20200830204640.482214-1-sw@weilnetz.de> 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 7726837e34..27a9a28f4c 100644 --- a/chardev/meson.build +++ b/chardev/meson.build @@ -38,7 +38,7 @@ chardev_modules =3D {} =20 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')) + module_ss.add(when: [sdl, brlapi], if_true: [files('baum.c'), pixman]) chardev_modules +=3D { 'baum': module_ss } endif =20 --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598952248; cv=none; d=zohomail.com; s=zohoarc; b=WE3fl/cPMUsW8FFKJqj9O6dsKklzgv36zCv2nteorEuT7tpjLTMtzHMLrCUcj8J4hzGQjPJfl1CJlXkLxNkpHXB0bAzBAMThV1HgeT7GzyIZI+G0Q2a7UTpcE5PQUBBQ1F+6D4osfsVvyyvhyZs4iBnSkBdjUlH/PrMGj9oV5sQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598952248; 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=X/Fax2FNyxBxy5u0eoIHCfhXtcAhzrgVnFOsa7MwnFk=; b=kXEvt6QmfMF5VfIIHylGkBHVzU5XaOC2SfYiz0M+wOoHE7/ZqRNhD4XuTAk5G8teFUwm5Q5j1/n5RU1jeSN+25yP5jmZwvIu3kj86Zfv4yLaR+RMHxtE6653kmohoWjMTdewQE8vT7HdS6XQp92v5gHdMx/aRaGzvM8f6fQmmWo= 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 1598952248083144.71611049246508; Tue, 1 Sep 2020 02:24:08 -0700 (PDT) Received: from localhost ([::1]:46196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2WN-0000Rr-Cu for importer@patchew.org; Tue, 01 Sep 2020 05:24:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33810) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KU-0003a8-E3 for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:22447) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD2KS-0006rc-KM for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:50 -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-302-FyLfm9tSOYCxLTWUuo9OZw-1; Tue, 01 Sep 2020 05:11:46 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 74C871074641; Tue, 1 Sep 2020 09:11:45 +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 F2A6B78B40; Tue, 1 Sep 2020 09:11:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951507; 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=X/Fax2FNyxBxy5u0eoIHCfhXtcAhzrgVnFOsa7MwnFk=; b=e63e8n98YGp1Y1TgD5AHFbpqOHGO8P24Q1cuu0xZRd8WzP61PgpSIdKk05qr+eEO0lT3pk BEVU2ZfSUqyjnV9WK3LrWdZSVHiGmO6qBjEmqd+BWTeG7WO+wo8bUjANsL+cs2Gn5fl/05 sIjQJLKhxHSr0mSBqc3gtUJsZbi9Ahk= X-MC-Unique: FyLfm9tSOYCxLTWUuo9OZw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 20/24] meson: add pixman dependency to UI modules Date: Tue, 1 Sep 2020 05:11:28 -0400 Message-Id: <20200901091132.29601-21-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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=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/31 23:17:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Weil 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" Pixman used to be included directly in QEMU_CFLAGS and therefore the include path was added to every compiler invocation. Now that (just like basically everything else) it is a separate dependency, we need to add it to all build target, especially UI modules that need it due to their including ui/console.h. Reported-by: Stefan Weil Signed-off-by: Paolo Bonzini --- ui/meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/meson.build b/ui/meson.build index aa8aa31516..82f60756d9 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -40,7 +40,7 @@ ui_modules =3D {} =20 if config_host.has_key('CONFIG_CURSES') curses_ss =3D ss.source_set() - curses_ss.add(when: [curses, iconv], if_true: files('curses.c')) + curses_ss.add(when: [curses, iconv], if_true: [files('curses.c'), pixman= ]) ui_modules +=3D {'curses' : curses_ss} endif =20 @@ -48,7 +48,7 @@ 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() - gtk_ss.add(gtk, vte, files('gtk.c')) + gtk_ss.add(gtk, vte, pixman, files('gtk.c')) gtk_ss.add(when: [x11, 'CONFIG_X11'], if_true: files('x_keymap.c')) gtk_ss.add(when: [opengl, 'CONFIG_OPENGL'], if_true: files('gtk-egl.c')) gtk_ss.add(when: [opengl, 'CONFIG_GTK_GL'], if_true: files('gtk-gl-area.= c')) @@ -71,7 +71,7 @@ endif =20 if config_host.has_key('CONFIG_SPICE') and config_host.has_key('CONFIG_GIO= ') spice_ss =3D ss.source_set() - spice_ss.add(spice, gio, files('spice-app.c')) + spice_ss.add(spice, gio, pixman, files('spice-app.c')) ui_modules +=3D {'spice-app': spice_ss} endif =20 --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598951810; cv=none; d=zohomail.com; s=zohoarc; b=T7HlyY3QGcoWWqzzjegaVuwBAPsXB0/RAEmX4pA+qfx2QvAWIMVdhYbVBDTJQy2uc19tdGsIUXEqdvac9vJ0YLBvVvrbZl7yydNGrnZBi/x9UwKWagdUaEvY6sQ/C9QKlVbyFDJ1c2yGBU7+WAovG6Of3DHSJirR9a/vUkRvvro= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598951810; 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=gOEB/WpowKRx2byhYj9Iw6P/49jTFJNd8n+vHCWtje4=; b=Z3qZyyM4Iw8ocuJMfxOlaIG+JYxSUkl/miAEW6s8QE8G06X00OxDnuzGiynX/5VjbszwOXJAymHw0mNL2Tz2jaQVhC1SdPpJVeYIX8s/xcC65qbYpv6WEtV+uH+CvwthKSzDrxX4N0t8FlCAobc/3nQtbSbxXtJFV2HytjG0qaM= 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 1598951810180251.91878787114706; Tue, 1 Sep 2020 02:16:50 -0700 (PDT) Received: from localhost ([::1]:43196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2PJ-0004kO-97 for importer@patchew.org; Tue, 01 Sep 2020 05:16:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KU-0003ax-KO for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:29773) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD2KS-0006rl-Ub for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:50 -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-194-wG5wUM0cNUenUXUmdrlcDA-1; Tue, 01 Sep 2020 05:11:46 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C37F2801AC5 for ; Tue, 1 Sep 2020 09:11:45 +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 90C8D78B4D for ; Tue, 1 Sep 2020 09:11:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951508; 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=gOEB/WpowKRx2byhYj9Iw6P/49jTFJNd8n+vHCWtje4=; b=dmLnX8Q1w9Th6ZSrM0YlNOj3W3juHdJs229hFTDnXX6kf/4NsFEks3nnIDcRjUARdNzg0p bJsWY/MR0S/yO+IpOMj+pzAUqHsau0in1E9HUwkGVyr55HF2SAOEZjhy1BQrCWs9PfLV/Q ruuY5lAe2b0uG6eR73ZR+07Wbt7hGow= X-MC-Unique: wG5wUM0cNUenUXUmdrlcDA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 21/24] configure: do not include ${prefix} in firmwarepath Date: Tue, 1 Sep 2020 05:11:29 -0400 Message-Id: <20200901091132.29601-22-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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=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/31 23:17:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Left out in commit 22a87800e6 ("configure: expand path variables for meson configure", 2020-08-21), do it now. Signed-off-by: Paolo Bonzini --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index b9e977f13d..8a3acef89d 100755 --- a/configure +++ b/configure @@ -473,7 +473,6 @@ LDFLAGS_SHARED=3D"-shared" modules=3D"no" module_upgrades=3D"no" prefix=3D"/usr/local" -firmwarepath=3D"\${prefix}/share/qemu-firmware" qemu_suffix=3D"qemu" slirp=3D"" oss_lib=3D"" @@ -1677,6 +1676,7 @@ for opt do esac done =20 +firmwarepath=3D"${firmwarepath:-$prefix/share/qemu-firmware}" libdir=3D"${libdir:-$prefix/lib}" libexecdir=3D"${libexecdir:-$prefix/libexec}" includedir=3D"${includedir:-$prefix/include}" --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598951865; cv=none; d=zohomail.com; s=zohoarc; b=ks73rSJu6cE1ZfalkcSJravvv5FHN1jFE/65kQccvlBDh54kVOy58N6k+bsLFCwngqeQ3IGrwlgKPfuJi+/4BCwyQbgzkPlvL7W432wx9NE26R1a4To505CBPV2BtHbwLNhawMDYiU8Ti98MmZuKuk5cdKxNei9dJcjudhLej1c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598951865; 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=b9AKTtufJsM2KUAdKcbxs9ux5QGHnOstuHgTA3nWgas=; b=Bygtb3hN7AFYhRKgBDHljrHnpJYm1xshmkUDqURMzhW4I/WSJAHIkmsWP9rAIGGg6OlmDGDi1mr5zbxXVx4DLldLPT1WVYh7x4PTMU29X2PYNE1PgSahnyUsVADad8oWSLUlLmKAFKuJ6XFNsjZ4XW6i2rbzmKMYhtOsQQXeS+A= 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 1598951865298330.0388451230174; Tue, 1 Sep 2020 02:17:45 -0700 (PDT) Received: from localhost ([::1]:47950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2QB-0006dm-Me for importer@patchew.org; Tue, 01 Sep 2020 05:17:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33826) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KV-0003dF-DY for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:28118) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD2KT-0006rv-Hz for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:51 -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-342---aZYPn4M22r4u2TadzsuA-1; Tue, 01 Sep 2020 05:11:46 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1ED4F10082E6 for ; Tue, 1 Sep 2020 09:11:46 +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 DF56A78B45 for ; Tue, 1 Sep 2020 09:11:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951508; 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=b9AKTtufJsM2KUAdKcbxs9ux5QGHnOstuHgTA3nWgas=; b=TmAM3eYYczgzYS3cUkUzgnTJrEpqEO17z/JBUivVXMlLUMcLwxaQRC3XeYu5ji3/Y9lVtx DvlTfOw1kk6qso1bqrKPi1J7BK1GApXsl/IY4Co+5d1uXnr/U1p3AgiRZuiU64XMRpp0IP q0v2f5zu3HQQLF7C8yJNTEvf1xrrFFM= X-MC-Unique: --aZYPn4M22r4u2TadzsuA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 22/24] meson: use pkg-config method to find dependencies Date: Tue, 1 Sep 2020 05:11:30 -0400 Message-Id: <20200901091132.29601-23-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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=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/31 23:17:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We do not need to ask cmake for the dependencies, so just use the pkg-config mechanism. Keep "auto" for SDL so that it tries using sdl-config too. The documentation is adjusted to use SDL2_image as the example, rather than SDL which does not use the "pkg-config" method. Signed-off-by: Paolo Bonzini --- docs/devel/build-system.rst | 27 ++++++++++++++------------- meson.build | 8 ++++---- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst index 58bf392430..0c09fb9a54 100644 --- a/docs/devel/build-system.rst +++ b/docs/devel/build-system.rst @@ -66,46 +66,47 @@ following tasks: upon completion. =20 =20 -Taking the probe for SDL as an example, we have the following pieces +Taking the probe for SDL2_Image as an example, we have the following pieces in configure:: =20 # Initial variable state - sdl=3Dauto + sdl_image=3Dauto =20 ..snip.. =20 # Configure flag processing - --disable-gnutls) sdl=3Ddisabled + --disable-sdl-image) sdl_image=3Ddisabled ;; - --enable-gnutls) sdl=3Denabled + --enable-sdl-image) sdl_image=3Denabled ;; =20 ..snip.. =20 # Help output feature message - sdl SDL UI + sdl-image SDL Image support for icons =20 ..snip.. =20 # Meson invocation - -Dsdl=3D$sdl + -Dsdl_image=3D$sdl_image =20 In meson_options.txt:: =20 - option('sdl', type : 'feature', value : 'auto') + option('sdl', type : 'feature', value : 'auto', + description: 'SDL Image support for icons') =20 In meson.build:: =20 # Detect dependency - sdl =3D dependency('sdl2', - required: get_option('sdl'), - static: enable_static) + sdl_image =3D dependency('SDL2_image', required: get_option('sdl_image'), + method: 'pkg-config', + static: enable_static) =20 - # Create config-host.h - config_host_data.set('CONFIG_SDL', sdl.found()) + # Create config-host.h (if applicable) + config_host_data.set('CONFIG_SDL_IMAGE', sdl_image.found()) =20 # Summary - summary_info +=3D {'SDL support': sdl.found()} + summary_info +=3D {'SDL image support': sdl_image.found()} =20 =20 =20 diff --git a/meson.build b/meson.build index 78ac86f3a1..0e2d884f5c 100644 --- a/meson.build +++ b/meson.build @@ -129,7 +129,7 @@ endif 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) + method: 'pkg-config', static: enable_static) endif pam =3D not_found if 'CONFIG_AUTH_PAM' in config_host @@ -168,7 +168,7 @@ if get_option('xkbcommon').auto() and not have_system a= nd not have_tools xkbcommon =3D not_found else xkbcommon =3D dependency('xkbcommon', required: get_option('xkbcommon'), - static: enable_static) + method: 'pkg-config', static: enable_static) endif slirp =3D not_found if config_host.has_key('CONFIG_SLIRP') @@ -247,7 +247,7 @@ if sdl.found() sdl =3D declare_dependency(compile_args: '-Wno-undef', dependencies: sdl) sdl_image =3D dependency('SDL2_image', required: get_option('sdl_image'), - static: enable_static) + method: 'pkg-config', static: enable_static) else if get_option('sdl_image').enabled() error('sdl-image required, but SDL was @0@', @@ -332,7 +332,7 @@ sasl =3D not_found if get_option('vnc').enabled() vnc =3D declare_dependency() # dummy dependency png =3D dependency('libpng', required: get_option('vnc_png'), - static: enable_static) + method: 'pkg-config', static: enable_static) jpeg =3D cc.find_library('jpeg', has_headers: ['jpeglib.h'], required: get_option('vnc_jpeg'), static: enable_static) --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598952016; cv=none; d=zohomail.com; s=zohoarc; b=JSh5Un0oHdW8pV+UaXkvcGUAQHwhf9+RAY5XgblRT67jF/3MaENwGcqrG0AG8xYdf2xmlegSikq9Xo5slzwJW9jT0KQdWI0pAWRiL4VWzCCWUWSnOZRT7jIpC+aXdiaX0KUcYNO/WEqKxjY0PSFNm3M/V1G8+AMKT/Ih3ToTGZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598952016; 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=pH3w6LJvCAG1/nlkX1a54epExI22nXwFJso3ShzjTwQ=; b=id9GGcItz3KAIF9EwGx7FtGF5jiNeuXJ1jM/N7ZlKZfAkn8u/oiK0OkEce/WFzmh7hiX7rnGFwU2GepSX0V6qZv83ABNNNsAYjRi8Rt5yBOF6GZgujGgyuo2EawU72HrGaKlF/j3NQlE18QaNWZTQGWzk2XYiUzVwvcpb2w81l0= 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 1598952016123842.7682993000072; Tue, 1 Sep 2020 02:20:16 -0700 (PDT) Received: from localhost ([::1]:60828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2Sd-0003JV-BF for importer@patchew.org; Tue, 01 Sep 2020 05:20:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33852) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KY-0003ka-Mm for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:54 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:49238) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kD2KV-0006sR-W9 for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:54 -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-354--zvGWfLHMQ-IuG0XdtU3yw-1; Tue, 01 Sep 2020 05:11:47 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8FCBD10082E8 for ; Tue, 1 Sep 2020 09:11:46 +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 3995678B45; Tue, 1 Sep 2020 09:11:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951511; 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=pH3w6LJvCAG1/nlkX1a54epExI22nXwFJso3ShzjTwQ=; b=XW5vxZZCR0nE2C+yn4C19tVQltxjm579d9T8lbivjyuDCsleHORHa+8uPHoliFa57vUdhC 3gR9ar7jvw5/4mNply6gcE1+yrPC5gcsU8HHEVzZnlHVqsY56Y1FRFQlcr8GDXWYCRyosV RfmpwT/xqBG3G373z4Tk9Y2fUvZJ80Q= X-MC-Unique: -zvGWfLHMQ-IuG0XdtU3yw-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 23/24] build: fix recurse-all target Date: Tue, 1 Sep 2020 05:11:31 -0400 Message-Id: <20200901091132.29601-24-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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=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/31 23:17:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Miroslav Rezanina , Thomas Huth 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" The missing "/all" suffix prevents the pc-bios/ parts of the build from running. In the meanwhile, -Wall has moved from QEMU_CFLAGS to CFLAGS. Simplify everything by not passing down CFLAGS, and add -Wall in the recursive Makefiles. Reported-by: Miroslav Rezanina Reviewed-by: Miroslav Rezanina Tested-by: Thomas Huth Fixes: 5e6d1573b4 ("remove Makefile.target", 2020-08-21) Signed-off-by: Paolo Bonzini --- Makefile | 4 ++-- pc-bios/optionrom/Makefile | 10 +++------- pc-bios/s390-ccw/Makefile | 3 ++- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index f187ddf47a..c1a93c66a0 100644 --- a/Makefile +++ b/Makefile @@ -186,10 +186,10 @@ ROM_DIRS_RULES=3D$(foreach t, all clean, $(addsuffix = /$(t), $(ROM_DIRS))) # Only keep -O and -g cflags .PHONY: $(ROM_DIRS_RULES) $(ROM_DIRS_RULES): - $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V=3D"$(V)" = TARGET_DIR=3D"$(dir $@)" CFLAGS=3D"$(filter -O% -g%,$(CFLAGS))" $(notdir $@= ),) + $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V=3D"$(V)" = TARGET_DIR=3D"$(dir $@)" $(notdir $@),) =20 .PHONY: recurse-all recurse-clean -recurse-all: $(ROM_DIRS) +recurse-all: $(addsuffix /all, $(ROM_DIRS)) recurse-clean: $(addsuffix /clean, $(ROM_DIRS)) =20 ###################################################################### diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 51cb6ca9d8..084fc10f05 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -8,15 +8,12 @@ all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvap= ic.bin pvh.bin @true =20 include ../../config-host.mak +CFLAGS =3D -O2 -g =20 quiet-command =3D $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1= , @$1)) -cc-option =3D $(if $(shell $(CC) $1 -S -o /dev/null -xc /dev/null >/dev/nu= ll 2>&1 && echo OK), $1, $2) +cc-option =3D $(if $(shell $(CC) $1 -c -o /dev/null -xc /dev/null >/dev/nu= ll 2>&1 && echo OK), $1, $2) =20 -# Compiling with no optimization creates ROMs that are too large -ifeq ($(lastword $(filter -O%, -O0 $(CFLAGS))),-O0) -override CFLAGS +=3D -O2 -endif -override CFLAGS +=3D -march=3Di486 +override CFLAGS +=3D -march=3Di486 -Wall =20 # Flags for dependency generation override CPPFLAGS +=3D -MMD -MP -MT $@ -MF $(@D)/$(*F).d @@ -42,7 +39,6 @@ Wa =3D -Wa, override ASFLAGS +=3D -32 override CFLAGS +=3D $(call cc-option, $(Wa)-32) =20 - LD_I386_EMULATION ?=3D elf_i386 override LDFLAGS =3D -m $(LD_I386_EMULATION) -T $(SRC_DIR)/flat.lds override LDFLAGS +=3D $(LDFLAGS_NOPIE) diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile index cc0f77baa6..3eb785048a 100644 --- a/pc-bios/s390-ccw/Makefile +++ b/pc-bios/s390-ccw/Makefile @@ -3,6 +3,7 @@ all: build-all @true =20 include ../../config-host.mak +CFLAGS =3D -O2 -g =20 quiet-command =3D $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1= , @$1)) cc-option =3D $(if $(shell $(CC) $1 -S -o /dev/null -xc /dev/null > /dev/n= ull \ @@ -28,7 +29,7 @@ QEMU_DGFLAGS =3D -MMD -MP -MT $@ -MF $(@D)/$(*F).d OBJECTS =3D start.o main.o bootmap.o jump2ipl.o sclp.o menu.o \ virtio.o virtio-scsi.o virtio-blkdev.o libc.o cio.o dasd-ipl.o =20 -QEMU_CFLAGS :=3D $(filter -W%, $(QEMU_CFLAGS)) +QEMU_CFLAGS :=3D -Wall $(filter -W%, $(QEMU_CFLAGS)) QEMU_CFLAGS +=3D -ffreestanding -fno-delete-null-pointer-checks -msoft-flo= at QEMU_CFLAGS +=3D -march=3Dz900 -fPIE -fno-strict-aliasing QEMU_CFLAGS +=3D -fno-asynchronous-unwind-tables --=20 2.26.2 From nobody Sat Feb 7 04:26:48 2026 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=1598952311; cv=none; d=zohomail.com; s=zohoarc; b=ZVANEwNNUaCTPRcG9pgAfT85HbRAlcVs7IirWJ8iMgzfKh7tPBgvOrD+fFJhhkCQjtHlWN+O/uzUWSg4bbcy//62goJFTd2+VhObvufmNGvGoZcCB36mg5jHG0hmf1p3zGDWvouz1imASP442UUs8dzopEfyd2igXTv0uDETE2A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598952311; 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=zFBQTBi25e5joBAp65GuMnsD8kwlFz5k6Gy++2C8kpU=; b=JgczQfjSLGwKa/oBylSv2toLEbD5QAo7Kwj8ru1zd37HR1vJpd0whl4p5kLfw+2aEJE+WnhxVDbnRRPC+nzRsr2pitkcykzxxoR0wjJEEnTbns08mUV+MEyY5sH+IalZ9Py99R7kVciZoJQBwSBoLKM9Ldz9dWSScR8SyIv6I64= 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 1598952311436740.1366383476512; Tue, 1 Sep 2020 02:25:11 -0700 (PDT) Received: from localhost ([::1]:49108 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kD2XO-0001dv-LK for importer@patchew.org; Tue, 01 Sep 2020 05:25:10 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kD2KV-0003e1-NN for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:51 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:26666 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 1kD2KU-0006s5-0n for qemu-devel@nongnu.org; Tue, 01 Sep 2020 05:11:51 -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-434-HyHZRB3uMeKizJUTnkLHEg-1; Tue, 01 Sep 2020 05:11:47 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DDB41800C60 for ; Tue, 1 Sep 2020 09:11:46 +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 AB05378B45 for ; Tue, 1 Sep 2020 09:11:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598951509; 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=zFBQTBi25e5joBAp65GuMnsD8kwlFz5k6Gy++2C8kpU=; b=RHWDCt3QUawYm0o2r/Dqoq/VjLHHa8oZR+CnslOQ5tsltiIs54MsOP/rOzooo/qaXvB9ll 8NCMI443LjVn/mJFjc0nbJs+mOUdE0mGe/wiPz7ra5gRXeDSoq5+qeh4nf7NVpErz40Ykh 0A35kt0blGV22srgVJkVsRnC7q8dPsM= X-MC-Unique: HyHZRB3uMeKizJUTnkLHEg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 24/24] meson: add description to options Date: Tue, 1 Sep 2020 05:11:32 -0400 Message-Id: <20200901091132.29601-25-pbonzini@redhat.com> In-Reply-To: <20200901091132.29601-1-pbonzini@redhat.com> References: <20200901091132.29601-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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/09/01 05:11:36 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_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" This will be useful in the future to generate configure command line parsing from meson_options.txt. Signed-off-by: Paolo Bonzini --- meson_options.txt | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/meson_options.txt b/meson_options.txt index c3120fa359..3e772f55b3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -2,12 +2,23 @@ option('qemu_suffix', type : 'string', value: 'qemu', description: 'Suffix for QEMU data/modules/config directories (can = be empty)') option('docdir', type : 'string', value : 'doc', description: 'Base directory for documentation installation (can be= empty)') -option('gettext', type : 'boolean', value : true) -option('sdl', type : 'feature', value : 'auto') -option('sdl_image', type : 'feature', value : 'auto') -option('u2f', type : 'feature', value : 'auto') -option('vnc', type : 'feature', value : 'enabled') -option('vnc_jpeg', type : 'feature', value : 'auto') -option('vnc_png', type : 'feature', value : 'auto') -option('vnc_sasl', type : 'feature', value : 'auto') -option('xkbcommon', type : 'feature', value : 'auto') + +option('gettext', type : 'boolean', value : true, + description: 'Localizationo of the GTK+ user interface') + +option('sdl', type : 'feature', value : 'auto', + description: 'SDL user interface') +option('sdl_image', type : 'feature', value : 'auto', + description: 'SDL Image support for icons') +option('u2f', type : 'feature', value : 'auto', + description: 'U2F emulation support') +option('vnc', type : 'feature', value : 'enabled', + description: 'VNC server') +option('vnc_jpeg', type : 'feature', value : 'auto', + description: 'JPEG lossy compression for VNC server') +option('vnc_png', type : 'feature', value : 'auto', + description: 'PNG compression for VNC server') +option('vnc_sasl', type : 'feature', value : 'auto', + description: 'SASL authentication for VNC server') +option('xkbcommon', type : 'feature', value : 'auto', + description: 'xkbcommon support') --=20 2.26.2