From nobody Mon Nov 17 09:48:37 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603721068; cv=none; d=zohomail.com; s=zohoarc; b=UfzqvQmATrFwg06StShVpghONvDau8bh6zG5g32HIHgSmiOPQPFuaSXaRMPv1xecX/9TtAUQqA8UAaQoaJlaO3ozePt0G0tq2dUxyUy70K9NZHFKikvhrKUPpMsR/9MtOC8xf2u5tFCrPwvRa55YVsTWXIlq8YPaEHkHBG/GTyg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603721068; 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=nXYkuQn/Ktxc4Km2i4G5V85tAZmsBxISL2OROJYTnmg=; b=V3HpHT3vJYx+iNKAU6wEDyQiJaMLUVqt6eRKggEKkdI5kUWGvIVYJBBngzqHK/YntBn/Q/CcsIpl+GnQBR0KDJL6Zms4AH+YURBTMA/QiymgveC+ns0FxdlT+QJkWX74yU5H2mVG8P5fHyJ7gsa7lfA/sRs4ZH4yuNFvBfPwDT8= 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 1603721068361499.3258963766822; Mon, 26 Oct 2020 07:04:28 -0700 (PDT) Received: from localhost ([::1]:39624 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kX36p-0002hy-EH for importer@patchew.org; Mon, 26 Oct 2020 10:04:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39662) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kX2uq-0005oj-Py for qemu-devel@nongnu.org; Mon, 26 Oct 2020 09:52:04 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:55987) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kX2ud-0001m3-2K for qemu-devel@nongnu.org; Mon, 26 Oct 2020 09:52:04 -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-551-K9kaxeDcMwaIinWrWZXCsg-1; Mon, 26 Oct 2020 09:51:37 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C4E78188C13A for ; Mon, 26 Oct 2020 13:51:36 +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 84EEA1043268 for ; Mon, 26 Oct 2020 13:51:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603720302; 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=nXYkuQn/Ktxc4Km2i4G5V85tAZmsBxISL2OROJYTnmg=; b=aHAryGCQef51eON0otT03JnKOGxC7UAyGDJbMkT+wQ4htvifr+k7PDr0WO7kIUeARVDJIW ci9VrRM+5vjJUb1jQSIiqVLMbMFWonLMlv9zL3/af4CrTlRYVnajefrFNOuHVE3du8VMYJ mw9rWph1QpXRWt9EZuZOMOdKQi0+cec= X-MC-Unique: K9kaxeDcMwaIinWrWZXCsg-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 10/17] configure: move directory options from config-host.mak to meson Date: Mon, 26 Oct 2020 09:51:24 -0400 Message-Id: <20201026135131.3006712-11-pbonzini@redhat.com> In-Reply-To: <20201026135131.3006712-1-pbonzini@redhat.com> References: <20201026135131.3006712-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/26 02:39:09 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Since installation is not part of Makefiles anymore, Make need not know the directories anymore. Meson already knows them through built-in options, do everything using them instead of the config_host dictionary. Signed-off-by: Paolo Bonzini --- Makefile | 4 +++ configure | 31 ++++---------------- contrib/vhost-user-gpu/meson.build | 2 +- meson.build | 47 ++++++++++++++++++++---------- meson_options.txt | 2 ++ pc-bios/descriptors/meson.build | 2 +- pc-bios/meson.build | 2 +- tools/virtiofsd/meson.build | 2 +- ui/icons/meson.build | 6 ++-- ui/meson.build | 2 +- version.texi.in | 2 -- 11 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 version.texi.in diff --git a/Makefile b/Makefile index 5236464d1f..4d1fa8bb3d 100644 --- a/Makefile +++ b/Makefile @@ -99,6 +99,10 @@ ifeq ($(wildcard build.ninja),) .PHONY: config-host.mak x :=3D $(shell rm -rf meson-private meson-info meson-logs) endif +ifeq ($(origin prefix),file) +.PHONY: config-host.mak +x :=3D $(shell rm -rf meson-private meson-info meson-logs) +endif =20 # 1. ensure config-host.mak is up-to-date config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/VER= SION diff --git a/configure b/configure index c214e9b38e..29e6732f47 100755 --- a/configure +++ b/configure @@ -1523,11 +1523,9 @@ 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}" -localedir=3D"${localedir:-$datadir/locale}" =20 if test "$mingw32" =3D "yes" ; then mandir=3D"$prefix" @@ -1535,7 +1533,7 @@ if test "$mingw32" =3D "yes" ; then docdir=3D"$prefix" bindir=3D"$prefix" sysconfdir=3D"$prefix" - local_statedir=3D + local_statedir=3D"$prefix" else mandir=3D"${mandir:-$prefix/share/man}" datadir=3D"${datadir:-$prefix/share}" @@ -1544,6 +1542,8 @@ else sysconfdir=3D"${sysconfdir:-$prefix/etc}" local_statedir=3D"${local_statedir:-$prefix/var}" fi +firmwarepath=3D"${firmwarepath:-$datadir/qemu-firmware}" +localedir=3D"${localedir:-$datadir/locale}" =20 case "$cpu" in ppc) @@ -5729,12 +5729,6 @@ if test "$mingw32" =3D "yes" ; then done fi =20 -qemu_confdir=3D"$sysconfdir/$qemu_suffix" -qemu_moddir=3D"$libdir/$qemu_suffix" -qemu_datadir=3D"$datadir/$qemu_suffix" -qemu_icondir=3D"$datadir/icons" -qemu_desktopdir=3D"$datadir/applications" - # We can only support ivshmem if we have eventfd if [ "$eventfd" =3D "yes" ]; then ivshmem=3Dyes @@ -5901,23 +5895,6 @@ echo "# Automatically generated by configure - do no= t modify" > $config_host_mak echo >> $config_host_mak =20 echo all: >> $config_host_mak -echo "prefix=3D$prefix" >> $config_host_mak -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 "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_moddir=3D$qemu_moddir" >> $config_host_mak -if test "$mingw32" =3D "no" ; then - echo "qemu_localstatedir=3D$local_statedir" >> $config_host_mak -fi -echo "qemu_helperdir=3D$libexecdir" >> $config_host_mak -echo "qemu_localedir=3D$localedir" >> $config_host_mak -echo "qemu_icondir=3D$qemu_icondir" >> $config_host_mak -echo "qemu_desktopdir=3D$qemu_desktopdir" >> $config_host_mak echo "GIT=3D$git" >> $config_host_mak echo "GIT_SUBMODULES=3D$git_submodules" >> $config_host_mak echo "GIT_UPDATE=3D$git_update" >> $config_host_mak @@ -7000,8 +6977,10 @@ NINJA=3D$ninja $meson setup \ --datadir "$datadir" \ --mandir "$mandir" \ --sysconfdir "$sysconfdir" \ + --localedir "$localedir" \ --localstatedir "$local_statedir" \ -Ddocdir=3D"$docdir" \ + -Dqemu_firmwarepath=3D"$firmwarepath" \ -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/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/me= son.build index 7d9b29da8b..37ecca13ca 100644 --- a/contrib/vhost-user-gpu/meson.build +++ b/contrib/vhost-user-gpu/meson.build @@ -9,6 +9,6 @@ if 'CONFIG_TOOLS' in config_host and 'CONFIG_VIRGL' in conf= ig_host \ =20 configure_file(input: '50-qemu-gpu.json.in', output: '50-qemu-gpu.json', - configuration: config_host, + configuration: { 'libexecdir' : get_option('libexecdir') = }, install_dir: qemu_datadir / 'vhost-user') endif diff --git a/meson.build b/meson.build index 0edde14ad7..4b6cca9238 100644 --- a/meson.build +++ b/meson.build @@ -29,8 +29,14 @@ if get_option('qemu_suffix').startswith('/') error('qemu_suffix cannot start with a /') endif =20 +qemu_confdir =3D get_option('sysconfdir') / get_option('qemu_suffix') qemu_datadir =3D get_option('datadir') / get_option('qemu_suffix') qemu_docdir =3D get_option('docdir') / get_option('qemu_suffix') +qemu_moddir =3D get_option('libdir') / get_option('qemu_suffix') + +qemu_desktopdir =3D get_option('datadir') / 'applications' +qemu_icondir =3D get_option('datadir') / 'icons' + config_host_data =3D configuration_data() genh =3D [] =20 @@ -734,6 +740,19 @@ endif # config-host.h # ################# =20 +config_host_data.set_quoted('CONFIG_BINDIR', get_option('prefix') / get_op= tion('bindir')) +config_host_data.set_quoted('CONFIG_PREFIX', get_option('prefix')) +config_host_data.set_quoted('CONFIG_QEMU_CONFDIR', get_option('prefix') / = qemu_confdir) +config_host_data.set_quoted('CONFIG_QEMU_DATADIR', get_option('prefix') / = qemu_datadir) +config_host_data.set_quoted('CONFIG_QEMU_DESKTOPDIR', get_option('prefix')= / qemu_desktopdir) +config_host_data.set_quoted('CONFIG_QEMU_FIRMWAREPATH', get_option('qemu_f= irmwarepath')) +config_host_data.set_quoted('CONFIG_QEMU_HELPERDIR', get_option('prefix') = / get_option('libexecdir')) +config_host_data.set_quoted('CONFIG_QEMU_ICONDIR', get_option('prefix') / = qemu_icondir) +config_host_data.set_quoted('CONFIG_QEMU_LOCALEDIR', get_option('prefix') = / get_option('localedir')) +config_host_data.set_quoted('CONFIG_QEMU_LOCALSTATEDIR', get_option('prefi= x') / get_option('localstatedir')) +config_host_data.set_quoted('CONFIG_QEMU_MODDIR', get_option('prefix') / q= emu_moddir) +config_host_data.set_quoted('CONFIG_SYSCONFDIR', get_option('prefix') / ge= t_option('sysconfdir')) + config_host_data.set('CONFIG_COCOA', cocoa.found()) config_host_data.set('CONFIG_LIBUDEV', libudev.found()) config_host_data.set('CONFIG_MPATH', mpathpersist.found()) @@ -756,9 +775,7 @@ config_host_data.set('QEMU_VERSION_MICRO', meson.projec= t_version().split('.')[2] =20 ignored =3D ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target arrays =3D ['CONFIG_AUDIO_DRIVERS', 'CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BD= RV_RO_WHITELIST'] -strings =3D ['HOST_DSOSUF', 'CONFIG_IASL', 'bindir', 'prefix', 'qemu_confd= ir', 'qemu_datadir', - 'qemu_moddir', 'qemu_localstatedir', 'qemu_helperdir', 'qemu_lo= caledir', - 'qemu_icondir', 'qemu_desktopdir', 'qemu_firmwarepath', 'syscon= fdir'] +strings =3D ['HOST_DSOSUF', 'CONFIG_IASL'] foreach k, v: config_host if ignored.contains(k) # do nothing @@ -1639,7 +1656,7 @@ foreach m : block_mods + softmmu_mods name_prefix: '', link_whole: m, install: true, - install_dir: config_host['qemu_moddir']) + install_dir: qemu_moddir) endforeach =20 softmmu_ss.add(authz, block, chardev, crypto, io, qmp) @@ -1800,7 +1817,7 @@ foreach target : target_dirs output: exe['name'] + stp['ext'], capture: true, install: stp['install'], - install_dir: qemu_datadir / '../systemtap/tapset', + install_dir: get_option('datadir') / 'systemtap/taps= et', command: [ tracetool, '--group=3Dall', '--format=3D' + stp['f= mt'], '--binary=3D' + stp['bin'], @@ -1913,17 +1930,17 @@ endif ######################### =20 summary_info =3D {} -summary_info +=3D {'Install prefix': config_host['prefix']} -summary_info +=3D {'BIOS directory': config_host['qemu_datadir']} -summary_info +=3D {'firmware path': config_host['qemu_firmwarepath']} -summary_info +=3D {'binary directory': config_host['bindir']} -summary_info +=3D {'library directory': config_host['libdir']} -summary_info +=3D {'module directory': config_host['qemu_moddir']} -summary_info +=3D {'libexec directory': config_host['libexecdir']} -summary_info +=3D {'include directory': config_host['includedir']} -summary_info +=3D {'config directory': config_host['sysconfdir']} +summary_info +=3D {'Install prefix': get_option('prefix')} +summary_info +=3D {'BIOS directory': qemu_datadir} +summary_info +=3D {'firmware path': get_option('qemu_firmwarepath')} +summary_info +=3D {'binary directory': get_option('bindir')} +summary_info +=3D {'library directory': get_option('libdir')} +summary_info +=3D {'module directory': qemu_moddir} +summary_info +=3D {'libexec directory': get_option('libexecdir')} +summary_info +=3D {'include directory': get_option('includedir')} +summary_info +=3D {'config directory': get_option('sysconfdir')} if targetos !=3D 'windows' - summary_info +=3D {'local state directory': config_host['qemu_localstate= dir']} + summary_info +=3D {'local state directory': get_option('localstatedir')} summary_info +=3D {'Manual directory': get_option('mandir')} else summary_info +=3D {'local state directory': 'queried at runtime'} diff --git a/meson_options.txt b/meson_options.txt index 967229b66e..02b446013a 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -2,6 +2,8 @@ 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('qemu_firmwarepath', type : 'string', value : '', + description: 'search PATH for firmware files') option('sphinx_build', type : 'string', value : '', description: 'Use specified sphinx-build [$sphinx_build] for buildi= ng document (default to be empty)') =20 diff --git a/pc-bios/descriptors/meson.build b/pc-bios/descriptors/meson.bu= ild index 3798d32372..a200e5ebc3 100644 --- a/pc-bios/descriptors/meson.build +++ b/pc-bios/descriptors/meson.build @@ -8,7 +8,7 @@ foreach f: [ ] configure_file(input: files(f), output: f, - configuration: {'DATADIR': config_host['qemu_datadir']}, + configuration: {'DATADIR': qemu_datadir}, install: install_blobs, install_dir: qemu_datadir / 'firmware') endforeach diff --git a/pc-bios/meson.build b/pc-bios/meson.build index a0d21be432..03df50c485 100644 --- a/pc-bios/meson.build +++ b/pc-bios/meson.build @@ -86,7 +86,7 @@ blobs =3D files( ) =20 if install_blobs - install_data(blobs, install_dir: config_host['qemu_datadir']) + install_data(blobs, install_dir: qemu_datadir) endif =20 subdir('descriptors') diff --git a/tools/virtiofsd/meson.build b/tools/virtiofsd/meson.build index 50022ed89e..e1a4dc98d9 100644 --- a/tools/virtiofsd/meson.build +++ b/tools/virtiofsd/meson.build @@ -15,5 +15,5 @@ executable('virtiofsd', files( =20 configure_file(input: '50-qemu-virtiofsd.json.in', output: '50-qemu-virtiofsd.json', - configuration: config_host, + configuration: { 'libexecdir' : get_option('libexecdir') }, install_dir: qemu_datadir / 'vhost-user') diff --git a/ui/icons/meson.build b/ui/icons/meson.build index b6e21f6ad7..12c52080eb 100644 --- a/ui/icons/meson.build +++ b/ui/icons/meson.build @@ -2,12 +2,12 @@ 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') + install_dir: qemu_icondir / 'hicolor' / s / 'apps') endforeach =20 install_data('qemu_32x32.bmp', rename: 'qemu.bmp', - install_dir: config_host['qemu_icondir'] / 'hicolor' / '32x32= ' / 'apps') + install_dir: qemu_icondir / 'hicolor' / '32x32' / 'apps') =20 install_data('qemu.svg', - install_dir: config_host['qemu_icondir'] / 'hicolor' / 'scala= ble' / 'apps') + install_dir: qemu_icondir / 'hicolor' / 'scalable' / 'apps') diff --git a/ui/meson.build b/ui/meson.build index 5d4906c023..013258a01c 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -139,7 +139,7 @@ subdir('shader') if have_system subdir('icons') =20 - install_data('qemu.desktop', install_dir: config_host['qemu_desktopdir']) + install_data('qemu.desktop', install_dir: qemu_desktopdir) endif =20 modules +=3D {'ui': ui_modules} diff --git a/version.texi.in b/version.texi.in deleted file mode 100644 index 0a723b8be6..0000000000 --- a/version.texi.in +++ /dev/null @@ -1,2 +0,0 @@ -@set VERSION @VERSION@ -@set CONFDIR @qemu_confdir@ --=20 2.26.2