Merge "Explicitly separate dependencies" into emu-dev

15 files changed, 37 insertions, 27 deletions

diff --git a/contrib/ivshmem-server/meson.build b/contrib/ivshmem-server/meson.build
index c6c3c82e89..0cf5cb4103 100644
--- a/contrib/ivshmem-server/meson.build
+++ b/contrib/ivshmem-server/meson.build
@@ -1,4 +1,4 @@
 executable('ivshmem-server', files('ivshmem-server.c', 'main.c'), genh,
-           dependencies: [qemuutil, rt],
+           dependencies: [qemuutil, print_stub, rt],
            build_by_default: targetos == 'linux',
            install: false)
diff --git a/contrib/vhost-user-blk/meson.build b/contrib/vhost-user-blk/meson.build
index dcb9e2ffcd..243d3d2bb0 100644
--- a/contrib/vhost-user-blk/meson.build
+++ b/contrib/vhost-user-blk/meson.build
@@ -1,4 +1,4 @@
 executable('vhost-user-blk', files('vhost-user-blk.c'),
-           dependencies: [qemuutil, vhost_user],
+           dependencies: [qemuutil, print_stub, vhost_user],
            build_by_default: targetos == 'linux',
            install: false)
diff --git a/contrib/vhost-user-gpu/meson.build b/contrib/vhost-user-gpu/meson.build
index c8883c2d8e..7364ffcb94 100644
--- a/contrib/vhost-user-gpu/meson.build
+++ b/contrib/vhost-user-gpu/meson.build
@@ -1,6 +1,6 @@
 if have_vhost_user_gpu
   executable('vhost-user-gpu', files('vhost-user-gpu.c', 'virgl.c', 'vugbm.c'),
-             dependencies: [qemuutil, pixman, gbm, virgl, vhost_user, opengl],
+             dependencies: [qemuutil, print_stub, pixman, gbm, virgl, vhost_user, opengl],
              install: true,
              install_dir: get_option('libexecdir'))
 
diff --git a/contrib/vhost-user-input/meson.build b/contrib/vhost-user-input/meson.build
index 21a9ed4f15..5e4cb4ebfd 100644
--- a/contrib/vhost-user-input/meson.build
+++ b/contrib/vhost-user-input/meson.build
@@ -1,4 +1,4 @@
 executable('vhost-user-input', files('main.c'),
-           dependencies: [qemuutil, vhost_user],
+           dependencies: [qemuutil, print_stub, vhost_user],
            build_by_default: targetos == 'linux',
            install: false)
diff --git a/contrib/vhost-user-scsi/meson.build b/contrib/vhost-user-scsi/meson.build
index cc893f6f20..5fab1db535 100644
--- a/contrib/vhost-user-scsi/meson.build
+++ b/contrib/vhost-user-scsi/meson.build
@@ -1,6 +1,6 @@
 if libiscsi.found()
   executable('vhost-user-scsi', files('vhost-user-scsi.c'),
-             dependencies: [qemuutil, libiscsi, vhost_user],
+             dependencies: [qemuutil, print_stub, libiscsi, vhost_user],
              build_by_default: targetos == 'linux',
              install: false)
 endif
diff --git a/fsdev/meson.build b/fsdev/meson.build
index 1bec065924..ab74ed6d66 100644
--- a/fsdev/meson.build
+++ b/fsdev/meson.build
@@ -12,7 +12,7 @@ system_ss.add_all(when: 'CONFIG_DARWIN', if_true: fsdev_ss)
 if have_virtfs_proxy_helper
   executable('virtfs-proxy-helper',
              files('virtfs-proxy-helper.c', '9p-marshal.c', '9p-iov-marshal.c'),
-             dependencies: [qemuutil, libattr, libcap_ng],
+             dependencies: [qemuutil, print_stub, libattr, libcap_ng],
              install: true,
              install_dir: get_option('libexecdir'))
 endif
diff --git a/meson.build b/meson.build
index 4f5445d335..bc40a15a78 100644
--- a/meson.build
+++ b/meson.build
@@ -3244,6 +3244,7 @@ system_ss = ss.source_set()
 specific_fuzz_ss = ss.source_set()
 specific_ss = ss.source_set()
 stub_ss = ss.source_set()
+print_stub_ss = ss.source_set()
 trace_ss = ss.source_set()
 user_ss = ss.source_set()
 util_ss = ss.source_set()
@@ -3421,6 +3422,15 @@ event_loop_base = declare_dependency(link_whole: event_loop_base,
                                      dependencies: [qom])
 
 stub_ss = stub_ss.apply(config_all, strict: false)
+print_stub_ss = print_stub_ss.apply(config_all, strict: false)
+
+
+libprint_stub = static_library('printstub', print_stub_ss.sources() + genh,
+                            name_suffix: 'fa',
+                            dependencies: print_stub_ss.dependencies(),
+                            build_by_default: false)
+
+print_stub = declare_dependency(link_with: libprint_stub)
 
 util_ss.add_all(trace_ss)
 util_ss = util_ss.apply(config_all, strict: false)
@@ -3979,12 +3989,12 @@ endif
 
 if have_tools
   qemu_img = executable('qemu-img', [files('qemu-img.c'), hxdep],
-             dependencies: [authz, block, crypto, io, qom, qemuutil], install: true)
+             dependencies: [authz, block, crypto, io, qom, qemuutil, print_stub], install: true)
   qemu_io = executable('qemu-io', files('qemu-io.c'),
-             dependencies: [block, qemuutil], install: true)
+             dependencies: [block, qemuutil, print_stub], install: true)
   if build_machine.system() != 'windows'
     qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
-                dependencies: [blockdev, qemuutil, gnutls, selinux],
+                dependencies: [blockdev, qemuutil, print_stub, gnutls, selinux],
                 install: true)
   endif
 
@@ -3993,7 +4003,7 @@ if have_tools
   subdir('contrib/elf2dmp')
 
   executable('qemu-edid', files('qemu-edid.c', 'hw/display/edid-generate.c'),
-             dependencies: qemuutil,
+             dependencies: [qemuutil, print_stub],
              install: true)
 
   if have_vhost_user
@@ -4005,12 +4015,12 @@ if have_tools
 
   if targetos == 'linux'
     executable('qemu-bridge-helper', files('qemu-bridge-helper.c'),
-               dependencies: [qemuutil, libcap_ng],
+               dependencies: [qemuutil, print_stub, libcap_ng],
                install: true,
                install_dir: get_option('libexecdir'))
 
     executable('qemu-pr-helper', files('scsi/qemu-pr-helper.c', 'scsi/utils.c'),
-               dependencies: [authz, crypto, io, qom, qemuutil,
+               dependencies: [authz, crypto, io, qom, qemuutil, print_stub,
                               libcap_ng, mpathpersist],
                install: true)
   endif
diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build
index 5e90cd32b4..df8ab04220 100644
--- a/storage-daemon/meson.build
+++ b/storage-daemon/meson.build
@@ -1,6 +1,6 @@
 qsd_ss = ss.source_set()
 qsd_ss.add(files('qemu-storage-daemon.c'))
-qsd_ss.add(blockdev, chardev, qmp, qom, qemuutil, gnutls)
+qsd_ss.add(blockdev, chardev, qmp, qom, qemuutil, print_stub, gnutls)
 
 subdir('qapi')
 
diff --git a/stubs/meson.build b/stubs/meson.build
index 0bf25e6ca5..1ecee185c1 100644
--- a/stubs/meson.build
+++ b/stubs/meson.build
@@ -9,7 +9,7 @@ stub_ss.add(files('cpus-get-virtual-clock.c'))
 stub_ss.add(files('qemu-timer-notify-cb.c'))
 stub_ss.add(files('icount.c'))
 stub_ss.add(files('dump.c'))
-stub_ss.add(files('error-printf.c'))
+print_stub_ss.add(files('error-printf.c'))
 stub_ss.add(files('fdset.c'))
 stub_ss.add(files('gdbstub.c'))
 stub_ss.add(files('get-vm-name.c'))
@@ -29,7 +29,7 @@ endif
 stub_ss.add(files('migr-blocker.c'))
 stub_ss.add(files('module-opts.c'))
 stub_ss.add(files('monitor.c'))
-stub_ss.add(files('monitor-core.c'))
+print_stub_ss.add(files('monitor-core.c'))
 stub_ss.add(files('physmem.c'))
 stub_ss.add(files('qemu-timer-notify-cb.c'))
 stub_ss.add(files('memory_device.c'))
diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build
index da8e608d00..f29e5c6b76 100644
--- a/target/hexagon/meson.build
+++ b/target/hexagon/meson.build
@@ -17,7 +17,7 @@
 
 hexagon_ss = ss.source_set()
 
-hex_common_py = 'hex_common.py'
+hex_common_py = meson.current_source_dir() / 'hex_common.py'
 attribs_def = meson.current_source_dir() / 'attribs_def.h.inc'
 gen_tcg_h = meson.current_source_dir() / 'gen_tcg.h'
 gen_tcg_hvx_h = meson.current_source_dir() / 'gen_tcg_hvx.h'
diff --git a/tests/bench/meson.build b/tests/bench/meson.build
index 3c799dbd98..945a4418a5 100644
--- a/tests/bench/meson.build
+++ b/tests/bench/meson.build
@@ -1,20 +1,20 @@
 
 qht_bench = executable('qht-bench',
                        sources: 'qht-bench.c',
-                       dependencies: [qemuutil])
+                       dependencies: [qemuutil, print_stub])
 
 qtree_bench = executable('qtree-bench',
                          sources: 'qtree-bench.c',
-                         dependencies: [qemuutil])
+                         dependencies: [qemuutil, print_stub])
 
 executable('atomic_add-bench',
            sources: files('atomic_add-bench.c'),
-           dependencies: [qemuutil],
+           dependencies: [qemuutil, print_stub],
            build_by_default: false)
 
 executable('atomic64-bench',
            sources: files('atomic64-bench.c'),
-           dependencies: [qemuutil],
+           dependencies: [qemuutil, print_stub],
            build_by_default: false)
 
 benchs = {}
@@ -30,7 +30,7 @@ endif
 
 foreach bench_name, deps: benchs
   exe = executable(bench_name, bench_name + '.c',
-                   dependencies: [qemuutil] + deps)
+                   dependencies: [qemuutil, print_stub] + deps)
   benchmark(bench_name, exe,
             args: ['--tap', '-k'],
             protocol: 'tap',
diff --git a/tests/fp/meson.build b/tests/fp/meson.build
index cbc17392d6..7aba7bb98a 100644
--- a/tests/fp/meson.build
+++ b/tests/fp/meson.build
@@ -47,7 +47,7 @@ fpcflags = [
 fptest = executable(
   'fp-test',
   ['fp-test.c', '../../fpu/softfloat.c'],
-  dependencies: [qemuutil, libsoftfloat, libtestfloat, libslowfloat],
+  dependencies: [qemuutil, print_stub, print_stub, libsoftfloat, libtestfloat, libslowfloat],
   c_args: fpcflags,
 )
 softfloat_conv_tests = {
@@ -129,14 +129,14 @@ test('fp-test-mulAdd', fptest,
 executable(
   'fp-bench',
   ['fp-bench.c', '../../fpu/softfloat.c'],
-  dependencies: [qemuutil, libtestfloat, libsoftfloat],
+  dependencies: [qemuutil, print_stub, libtestfloat, libsoftfloat],
   c_args: fpcflags,
 )
 
 fptestlog2 = executable(
   'fp-test-log2',
   ['fp-test-log2.c', '../../fpu/softfloat.c'],
-  dependencies: [qemuutil, libsoftfloat],
+  dependencies: [qemuutil, print_stub, libsoftfloat],
   c_args: fpcflags,
 )
 test('fp-test-log2', fptestlog2,
diff --git a/tests/meson.build b/tests/meson.build
index 9996a293fb..f5eff79f72 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -71,7 +71,7 @@ test_deps = {
 if have_tools and have_vhost_user and targetos == 'linux'
   executable('vhost-user-bridge',
              sources: files('vhost-user-bridge.c'),
-             dependencies: [qemuutil, vhost_user])
+             dependencies: [qemuutil, print_stub, vhost_user])
 endif
 
 subdir('decode')
diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build
index bf2caa76a5..40787ba264 100644
--- a/tests/qtest/meson.build
+++ b/tests/qtest/meson.build
@@ -369,7 +369,7 @@ foreach dir : target_dirs
     # encounter them
     if not qtest_executables.has_key(test)
       src = [test + '.c']
-      deps = [qemuutil, qos]
+      deps = [qemuutil, print_stub, qos]
       if test in qtests
         # use a sourceset to quickly separate sources and deps
         test_ss = ss.source_set()
diff --git a/tests/unit/meson.build b/tests/unit/meson.build
index a05d471090..36f88a0a4d 100644
--- a/tests/unit/meson.build
+++ b/tests/unit/meson.build
@@ -178,7 +178,7 @@ slow_tests = {
 
 foreach test_name, extra: tests
   src = [test_name + '.c']
-  deps = [qemuutil]
+  deps = [qemuutil, print_stub]
   if extra.length() > 0
     # use a sourceset to quickly separate sources and deps
     test_ss = ss.source_set()