SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

crypto: Move the creation of the library to the main meson.build

Browse Source 
Be consistent creating all the libraries in the main meson.build file.

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20201006125602.2311423-8-philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2020-10-06 14:56:00 +02:00 committed by Paolo Bonzini
parent f78536b149
commit 2389304a72
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crypto/meson.build
View File

@ -1,4 +1,3 @@
crypto_ss = ss.source_set()
crypto_ss.add(genh) crypto_ss.add(genh)
crypto_ss.add(files( crypto_ss.add(files(
'afsplit.c', 'afsplit.c',
@ -52,15 +51,6 @@ if 'CONFIG_GNUTLS' in config_host
endif endif
crypto_ss = crypto_ss.apply(config_host, strict: false)
libcrypto = static_library('crypto', crypto_ss.sources() + genh,
dependencies: [crypto_ss.dependencies()],
name_suffix: 'fa',
build_by_default: false)
crypto = declare_dependency(link_whole: libcrypto,
dependencies: [authz, qom])
util_ss.add(files('aes.c')) util_ss.add(files('aes.c'))
util_ss.add(files('init.c')) util_ss.add(files('init.c'))

10
meson.build
View File

@ -1187,6 +1187,7 @@ block_ss = ss.source_set()
bsd_user_ss = ss.source_set() bsd_user_ss = ss.source_set()
chardev_ss = ss.source_set() chardev_ss = ss.source_set()
common_ss = ss.source_set() common_ss = ss.source_set()
crypto_ss = ss.source_set()
io_ss = ss.source_set() io_ss = ss.source_set()
linux_user_ss = ss.source_set() linux_user_ss = ss.source_set()
qmp_ss = ss.source_set() qmp_ss = ss.source_set()
@ -1452,6 +1453,15 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms',
# Library dependencies # # Library dependencies #
######################## ########################
crypto_ss = crypto_ss.apply(config_host, strict: false)
libcrypto = static_library('crypto', crypto_ss.sources() + genh,
dependencies: [crypto_ss.dependencies()],
name_suffix: 'fa',
build_by_default: false)
crypto = declare_dependency(link_whole: libcrypto,
dependencies: [authz, qom])
io_ss = io_ss.apply(config_host, strict: false) io_ss = io_ss.apply(config_host, strict: false)
libio = static_library('io', io_ss.sources() + genh, libio = static_library('io', io_ss.sources() + genh,
dependencies: [io_ss.dependencies()], dependencies: [io_ss.dependencies()],