From e58e55dd8d5777f8a58ce30cfe04a8023282eb80 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 7 Jun 2023 10:00:21 +0200 Subject: [PATCH 1/3] meson: fix "static build" entry in summary Fixes: a0cbd2e8496 ("meson: use prefer_static option", 2023-05-18) Signed-off-by: Paolo Bonzini --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 553c8e0b9c..c03326c922 100644 --- a/meson.build +++ b/meson.build @@ -4088,7 +4088,7 @@ summary_info += {'QEMU_LDFLAGS': ' '.join(qemu_ldflags)} summary_info += {'profiler': get_option('profiler')} summary_info += {'link-time optimization (LTO)': get_option('b_lto')} summary_info += {'PIE': get_option('b_pie')} -summary_info += {'static build': config_host.has_key('CONFIG_STATIC')} +summary_info += {'static build': get_option('prefer_static')} summary_info += {'malloc trim support': has_malloc_trim} summary_info += {'membarrier': have_membarrier} summary_info += {'debug graph lock': get_option('debug_graph_lock')} From c06b1571cc5c27b2042315b2a1c99f477a497716 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Wed, 7 Jun 2023 10:01:03 +0200 Subject: [PATCH 2/3] configure: check for $download value properly If configure was invoked with --disable-download and git submodules were not checked out a warning is produced and the configure script fails. But the $download variable (which reflects the enable/disable download argument) is checked for in a weird fashion: test -f "$download" = disabled Drop the '-f' to check for the actual value of the variable. Fixes: 2019cabfee0 ("meson: subprojects: replace submodules with wrap files", 2023-06-06) Signed-off-by: Michal Privoznik Signed-off-by: Paolo Bonzini --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 8765b88e12..8a638dd82a 100755 --- a/configure +++ b/configure @@ -767,7 +767,7 @@ if test "$plugins" = "yes" -a "$tcg" = "disabled"; then fi if ! test -f "$source_path/subprojects/keycodemapdb/README" \ - && test -f "$download" = disabled + && test "$download" = disabled then echo echo "ERROR: missing subprojects" From 45904b56d5321be5f6e2c9e12bd143fb3b871ca8 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 7 Jun 2023 11:00:09 +0200 Subject: [PATCH 3/3] tests: fp: remove unused submodules tests/fp/berkeley-softfloat-3 and tests/fp/berkeley-testfloat-3 have been replaced by subprojects, so remove the now-unnecessary submodules. Reported-by: Michal Privoznik Signed-off-by: Paolo Bonzini --- tests/fp/berkeley-softfloat-3 | 1 - tests/fp/berkeley-testfloat-3 | 1 - 2 files changed, 2 deletions(-) delete mode 160000 tests/fp/berkeley-softfloat-3 delete mode 160000 tests/fp/berkeley-testfloat-3 diff --git a/tests/fp/berkeley-softfloat-3 b/tests/fp/berkeley-softfloat-3 deleted file mode 160000 index b64af41c32..0000000000 --- a/tests/fp/berkeley-softfloat-3 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b64af41c3276f97f0e181920400ee056b9c88037 diff --git a/tests/fp/berkeley-testfloat-3 b/tests/fp/berkeley-testfloat-3 deleted file mode 160000 index 40619cbb3b..0000000000 --- a/tests/fp/berkeley-testfloat-3 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 40619cbb3bf32872df8c53cc457039229428a263