diff options
author | Erwin Jansen <jansene@google.com> | 2024-04-26 16:27:52 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-26 16:27:52 +0000 |
commit | fd6d4f07d0f79ca238c37f7e836dc4c5d7db14b1 (patch) | |
tree | 1b87b16ee16eff5d12392f0d5999c854734824fd | |
parent | 69ad35193045c6513f71a8ad4834cc27d0b8abe7 (diff) | |
download | qemu-fd6d4f07d0f79ca238c37f7e836dc4c5d7db14b1.tar.gz |
Revert "Explicitly separate dependencies"
This reverts commit 69ad35193045c6513f71a8ad4834cc27d0b8abe7.
Reason for revert: This breaks the standard qemu build, we need to use shims instead.
Change-Id: I1e0e1b3fc9fba45a9d72c7db4ec364d5cf03159b
-rw-r--r-- | contrib/ivshmem-server/meson.build | 2 | ||||
-rw-r--r-- | contrib/vhost-user-blk/meson.build | 2 | ||||
-rw-r--r-- | contrib/vhost-user-gpu/meson.build | 2 | ||||
-rw-r--r-- | contrib/vhost-user-input/meson.build | 2 | ||||
-rw-r--r-- | contrib/vhost-user-scsi/meson.build | 2 | ||||
-rw-r--r-- | fsdev/meson.build | 2 | ||||
-rw-r--r-- | meson.build | 22 | ||||
-rw-r--r-- | storage-daemon/meson.build | 2 | ||||
-rw-r--r-- | stubs/meson.build | 4 | ||||
-rw-r--r-- | target/hexagon/meson.build | 2 | ||||
-rw-r--r-- | tests/bench/meson.build | 10 | ||||
-rw-r--r-- | tests/fp/meson.build | 6 | ||||
-rw-r--r-- | tests/meson.build | 2 | ||||
-rw-r--r-- | tests/qtest/meson.build | 2 | ||||
-rw-r--r-- | tests/unit/meson.build | 2 |
15 files changed, 27 insertions, 37 deletions
diff --git a/contrib/ivshmem-server/meson.build b/contrib/ivshmem-server/meson.build index 0cf5cb4103..c6c3c82e89 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, print_stub, rt], + dependencies: [qemuutil, 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 243d3d2bb0..dcb9e2ffcd 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, print_stub, vhost_user], + dependencies: [qemuutil, 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 7364ffcb94..c8883c2d8e 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, print_stub, pixman, gbm, virgl, vhost_user, opengl], + dependencies: [qemuutil, 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 5e4cb4ebfd..21a9ed4f15 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, print_stub, vhost_user], + dependencies: [qemuutil, 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 5fab1db535..cc893f6f20 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, print_stub, libiscsi, vhost_user], + dependencies: [qemuutil, libiscsi, vhost_user], build_by_default: targetos == 'linux', install: false) endif diff --git a/fsdev/meson.build b/fsdev/meson.build index ab74ed6d66..1bec065924 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, print_stub, libattr, libcap_ng], + dependencies: [qemuutil, libattr, libcap_ng], install: true, install_dir: get_option('libexecdir')) endif diff --git a/meson.build b/meson.build index bc40a15a78..4f5445d335 100644 --- a/meson.build +++ b/meson.build @@ -3244,7 +3244,6 @@ 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() @@ -3422,15 +3421,6 @@ 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) @@ -3989,12 +3979,12 @@ endif if have_tools qemu_img = executable('qemu-img', [files('qemu-img.c'), hxdep], - dependencies: [authz, block, crypto, io, qom, qemuutil, print_stub], install: true) + dependencies: [authz, block, crypto, io, qom, qemuutil], install: true) qemu_io = executable('qemu-io', files('qemu-io.c'), - dependencies: [block, qemuutil, print_stub], install: true) + dependencies: [block, qemuutil], install: true) if build_machine.system() != 'windows' qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'), - dependencies: [blockdev, qemuutil, print_stub, gnutls, selinux], + dependencies: [blockdev, qemuutil, gnutls, selinux], install: true) endif @@ -4003,7 +3993,7 @@ if have_tools subdir('contrib/elf2dmp') executable('qemu-edid', files('qemu-edid.c', 'hw/display/edid-generate.c'), - dependencies: [qemuutil, print_stub], + dependencies: qemuutil, install: true) if have_vhost_user @@ -4015,12 +4005,12 @@ if have_tools if targetos == 'linux' executable('qemu-bridge-helper', files('qemu-bridge-helper.c'), - dependencies: [qemuutil, print_stub, libcap_ng], + dependencies: [qemuutil, 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, print_stub, + dependencies: [authz, crypto, io, qom, qemuutil, libcap_ng, mpathpersist], install: true) endif diff --git a/storage-daemon/meson.build b/storage-daemon/meson.build index df8ab04220..5e90cd32b4 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, print_stub, gnutls) +qsd_ss.add(blockdev, chardev, qmp, qom, qemuutil, gnutls) subdir('qapi') diff --git a/stubs/meson.build b/stubs/meson.build index 1ecee185c1..0bf25e6ca5 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')) -print_stub_ss.add(files('error-printf.c')) +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')) -print_stub_ss.add(files('monitor-core.c')) +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 f29e5c6b76..da8e608d00 100644 --- a/target/hexagon/meson.build +++ b/target/hexagon/meson.build @@ -17,7 +17,7 @@ hexagon_ss = ss.source_set() -hex_common_py = meson.current_source_dir() / 'hex_common.py' +hex_common_py = '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 945a4418a5..3c799dbd98 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, print_stub]) + dependencies: [qemuutil]) qtree_bench = executable('qtree-bench', sources: 'qtree-bench.c', - dependencies: [qemuutil, print_stub]) + dependencies: [qemuutil]) executable('atomic_add-bench', sources: files('atomic_add-bench.c'), - dependencies: [qemuutil, print_stub], + dependencies: [qemuutil], build_by_default: false) executable('atomic64-bench', sources: files('atomic64-bench.c'), - dependencies: [qemuutil, print_stub], + dependencies: [qemuutil], build_by_default: false) benchs = {} @@ -30,7 +30,7 @@ endif foreach bench_name, deps: benchs exe = executable(bench_name, bench_name + '.c', - dependencies: [qemuutil, print_stub] + deps) + dependencies: [qemuutil] + deps) benchmark(bench_name, exe, args: ['--tap', '-k'], protocol: 'tap', diff --git a/tests/fp/meson.build b/tests/fp/meson.build index 7aba7bb98a..cbc17392d6 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, print_stub, print_stub, libsoftfloat, libtestfloat, libslowfloat], + dependencies: [qemuutil, 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, print_stub, libtestfloat, libsoftfloat], + dependencies: [qemuutil, libtestfloat, libsoftfloat], c_args: fpcflags, ) fptestlog2 = executable( 'fp-test-log2', ['fp-test-log2.c', '../../fpu/softfloat.c'], - dependencies: [qemuutil, print_stub, libsoftfloat], + dependencies: [qemuutil, libsoftfloat], c_args: fpcflags, ) test('fp-test-log2', fptestlog2, diff --git a/tests/meson.build b/tests/meson.build index f5eff79f72..9996a293fb 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, print_stub, vhost_user]) + dependencies: [qemuutil, vhost_user]) endif subdir('decode') diff --git a/tests/qtest/meson.build b/tests/qtest/meson.build index 40787ba264..bf2caa76a5 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, print_stub, qos] + deps = [qemuutil, 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 36f88a0a4d..a05d471090 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, print_stub] + deps = [qemuutil] if extra.length() > 0 # use a sourceset to quickly separate sources and deps test_ss = ss.source_set() |