[PULL 0/3] SNAFU build system fixes for 2023-06-07

[PULL 0/3] SNAFU build system fixes for 2023-06-07

[Paolo Bonzini]

The following changes since commit f5e6786de4815751b0a3d2235c760361f228ea48:

  Merge tag 'pull-target-arm-20230606' of https://git.linaro.org/people/pmaydell/qemu-arm into staging (2023-06-06 12:11:34 -0700)

are available in the Git repository at:

  https://gitlab.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to 45904b56d5321be5f6e2c9e12bd143fb3b871ca8:

  tests: fp: remove unused submodules (2023-06-07 11:05:09 +0200)

----------------------------------------------------------------
Build system snafus.

----------------------------------------------------------------
Michal Privoznik (1):
      configure: check for $download value properly

Paolo Bonzini (2):
      meson: fix "static build" entry in summary
      tests: fp: remove unused submodules

 configure                     | 2 +-
 meson.build                   | 2 +-
 tests/fp/berkeley-softfloat-3 | 1 -
 tests/fp/berkeley-testfloat-3 | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)
 delete mode 160000 tests/fp/berkeley-softfloat-3
 delete mode 160000 tests/fp/berkeley-testfloat-3
-- 
2.40.1

[PULL 1/3] meson: fix "static build" entry in summary

[Paolo Bonzini]

Fixes: a0cbd2e8496 ("meson: use prefer_static option", 2023-05-18)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 553c8e0b9c5..c03326c922e 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')}
-- 
2.40.1

[PULL 2/3] configure: check for $download value properly

[Paolo Bonzini]

From: Michal Privoznik <mprivozn@redhat.com>

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 <mprivozn@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure b/configure
index 8765b88e12f..8a638dd82ae 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"
-- 
2.40.1

[PULL 3/3] tests: fp: remove unused submodules

[Paolo Bonzini]

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 <mprivozn@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 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 b64af41c327..00000000000
--- 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 40619cbb3bf..00000000000
--- a/tests/fp/berkeley-testfloat-3
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 40619cbb3bf32872df8c53cc457039229428a263
-- 
2.40.1

Re: [PULL 0/3] SNAFU build system fixes for 2023-06-07

[Richard Henderson]

On 6/7/23 08:47, Paolo Bonzini wrote:
> The following changes since commit f5e6786de4815751b0a3d2235c760361f228ea48:
> 
>    Merge tag 'pull-target-arm-20230606' ofhttps://git.linaro.org/people/pmaydell/qemu-arm  into staging (2023-06-06 12:11:34 -0700)
> 
> are available in the Git repository at:
> 
>    https://gitlab.com/bonzini/qemu.git  tags/for-upstream
> 
> for you to fetch changes up to 45904b56d5321be5f6e2c9e12bd143fb3b871ca8:
> 
>    tests: fp: remove unused submodules (2023-06-07 11:05:09 +0200)
> 
> ----------------------------------------------------------------
> Build system snafus.

Applied, thanks.  Please update https://wiki.qemu.org/ChangeLog/8.1 as appropriate.


r~