mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "meson: Propagate gnutls dependency"

Browse Source 
This reverts commit 3eacf70bb5.

It was only needed because of duplicate objects caused by
declare_dependency(link_whole: ...), and can be dropped now
that meson.build specifies objects and dependencies separately
for the internal dependencies.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Message-ID: <20240524-objects-v1-2-07cbbe96166b@daynix.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Akihiko Odaki 2024-05-24 17:00:23 +09:00 committed by Paolo Bonzini
parent 414b180d42
commit 7b1070a7e1
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
block/meson.build
View File

@ -39,7 +39,7 @@ block_ss.add(files(
'throttle.c', 'throttle.c',
'throttle-groups.c', 'throttle-groups.c',
'write-threshold.c', 'write-threshold.c',
), zstd, zlib, gnutls) ), zstd, zlib)
system_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c')) system_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
system_ss.add(files('block-ram-registrar.c')) system_ss.add(files('block-ram-registrar.c'))

2
io/meson.build
View File

@ -13,4 +13,4 @@ io_ss.add(files(
'dns-resolver.c', 'dns-resolver.c',
'net-listener.c', 'net-listener.c',
'task.c', 'task.c',
), gnutls) ))

4
meson.build
View File

@ -3526,7 +3526,7 @@ if have_block
'blockdev-nbd.c', 'blockdev-nbd.c',
'iothread.c', 'iothread.c',
'job-qmp.c', 'job-qmp.c',
), gnutls) ))
# os-posix.c contains POSIX-specific functions used by qemu-storage-daemon, # os-posix.c contains POSIX-specific functions used by qemu-storage-daemon,
# os-win32.c does not # os-win32.c does not
@ -4044,7 +4044,7 @@ if have_tools
dependencies: [block, qemuutil], install: true) dependencies: [block, qemuutil], install: true)
qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'), qemu_nbd = executable('qemu-nbd', files('qemu-nbd.c'),
link_args: '@block.syms', link_depends: block_syms, link_args: '@block.syms', link_depends: block_syms,
dependencies: [blockdev, qemuutil, gnutls, selinux], dependencies: [blockdev, qemuutil, selinux],
install: true) install: true)
subdir('storage-daemon') subdir('storage-daemon')

2
storage-daemon/meson.build
View File

@ -1,6 +1,6 @@
qsd_ss = ss.source_set() qsd_ss = ss.source_set()
qsd_ss.add(files('qemu-storage-daemon.c')) 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)
subdir('qapi') subdir('qapi')

2
ui/meson.build
View File

@ -44,7 +44,7 @@ vnc_ss.add(files(
'vnc-jobs.c', 'vnc-jobs.c',
'vnc-clipboard.c', 'vnc-clipboard.c',
)) ))
vnc_ss.add(zlib, jpeg, gnutls) vnc_ss.add(zlib, jpeg)
vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c')) vnc_ss.add(when: sasl, if_true: files('vnc-auth-sasl.c'))
system_ss.add_all(when: [vnc, pixman], if_true: vnc_ss) system_ss.add_all(when: [vnc, pixman], if_true: vnc_ss)
system_ss.add(when: vnc, if_false: files('vnc-stubs.c')) system_ss.add(when: vnc, if_false: files('vnc-stubs.c'))