[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 27/39] meson: compute config_all_devices directly
From: |
Paolo Bonzini |
Subject: |
[PATCH 27/39] meson: compute config_all_devices directly |
Date: |
Wed, 2 Sep 2020 08:59:05 -0400 |
There is no need anymore to produce config-all-devices.mak, compute
the resulting dictionary directly instead of going through grepy.sh.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.gitignore | 1 -
meson.build | 14 ++------------
scripts/grepy.sh | 3 ---
3 files changed, 2 insertions(+), 16 deletions(-)
delete mode 100755 scripts/grepy.sh
diff --git a/.gitignore b/.gitignore
index 4ccb9ed975..f3fbd87ce4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
/build/
/.doctrees
/config-devices.*
-/config-all-devices.*
/config-all-disas.*
/config-host.*
/config-target.*
diff --git a/meson.build b/meson.build
index b71f561c96..037ccd3f4c 100644
--- a/meson.build
+++ b/meson.build
@@ -455,6 +455,7 @@ endforeach
genh += configure_file(output: 'config-host.h', configuration:
config_host_data)
minikconf = find_program('scripts/minikconf.py')
+config_all_devices = {}
config_devices_mak_list = []
config_devices_h = {}
config_target_h = {}
@@ -523,11 +524,11 @@ foreach target : target_dirs
config_devices_h += {target: configure_file(output: target +
'-config-devices.h',
configuration:
config_devices_data)}
config_target += config_devices
+ config_all_devices += config_devices
endif
config_target_mak += {target: config_target}
endforeach
-grepy = find_program('scripts/grepy.sh')
# This configuration is used to build files that are shared by
# multiple binaries, and then extracted out of the "common"
# static_library target.
@@ -537,17 +538,6 @@ grepy = find_program('scripts/grepy.sh')
# targets that are not built for this compilation. The CONFIG_ALL
# pseudo symbol replaces it.
-if have_system
- config_all_devices_mak = configure_file(
- output: 'config-all-devices.mak',
- input: config_devices_mak_list,
- capture: true,
- command: [grepy, '@INPUT@'],
- )
- config_all_devices = keyval.load(config_all_devices_mak)
-else
- config_all_devices = {}
-endif
config_all = config_all_devices
config_all += config_host
config_all += config_all_disas
diff --git a/scripts/grepy.sh b/scripts/grepy.sh
deleted file mode 100755
index aee46ddc8d..0000000000
--- a/scripts/grepy.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-grep -h '=y$' "$@" | sort -u
--
2.26.2
- [PATCH 31/39] configure: move C++ compiler handling to meson, (continued)
- [PATCH 31/39] configure: move C++ compiler handling to meson, Paolo Bonzini, 2020/09/02
- [PATCH 22/39] meson: convert the speed tests, Paolo Bonzini, 2020/09/02
- [PATCH 25/39] meson: convert migration/initrd-stress, Paolo Bonzini, 2020/09/02
- [PATCH 32/39] meson: keep all compiler flags detection together, Paolo Bonzini, 2020/09/02
- [PATCH 34/39] configure: remove unnecessary libm test, Paolo Bonzini, 2020/09/02
- [PATCH 39/39] docs: suggest Meson replacements for various configure functions, Paolo Bonzini, 2020/09/02
- [PATCH 36/39] meson: get glib compilation flags from GLIB_CFLAGS, Paolo Bonzini, 2020/09/02
- [PATCH 16/39] meson: convert the unit tests, Paolo Bonzini, 2020/09/02
- [PATCH 37/39] configure: do not include dependency flags in QEMU_CFLAGS and LIBS, Paolo Bonzini, 2020/09/02
- [PATCH 30/39] configure: move disassembler configuration to meson, Paolo Bonzini, 2020/09/02
- [PATCH 27/39] meson: compute config_all_devices directly,
Paolo Bonzini <=
- [PATCH 28/39] Makefile: remove dead variables and includes, Paolo Bonzini, 2020/09/02
- [PATCH 38/39] configure: drop dead variables, Paolo Bonzini, 2020/09/02
- [PATCH 33/39] configure: move -ldl test to meson, Paolo Bonzini, 2020/09/02
- [PATCH 35/39] configure: do not look for install(1), Paolo Bonzini, 2020/09/02
- Re: [PATCH 00/39] Next round of Meson fixes and cleanups, Marc-André Lureau, 2020/09/02