Re: [PATCH] meson: Propagate gnutls dependency

[Paolo Bonzini]

On 05/01/21 15:37, Roman Bolshakov wrote:
> > Does it work if you do:
> >
> > crypto_ss.add(authz, qom)
> > libcrypto = static_library('crypto', crypto_ss.sources() + genh,
> >                             dependencies: crypto_ss.dependencies(),
> >                             ...)
> > crypto = declare_dependency(link_whole: libcrypto,
> >                              dependencies: crypto_ss.dependencies())
>
> I tried that approach before I sent the patch in the subject. It
> produces duplicate symbols:
>
>    duplicate symbol '_qauthz_pam_new' in:
>        libcrypto.fa(authz_pamacct.c.o)
>        libauthz.fa(authz_pamacct.c.o)
>    [...]
>    duplicate symbol '_object_property_set_qobject' in:
>        libcrypto.fa(qom_qom-qobject.c.o)                                        
>                                                                                 
>                                                                                 
>                     libqom.fa(qom_qom-qobject.c.o)
>
> My impression that it links in every static library that's mentioned in
> dependencies of static_library, so they grow like a snow ball. Patch
> below:

Okay, I'll look more into it.

Paolo

> diff --git a/block/meson.build b/block/meson.build
> index 7595d86c41..7eaf48c6dc 100644
> --- a/block/meson.build
> +++ b/block/meson.build
> @@ -40,7 +40,7 @@ block_ss.add(files(
>     'vmdk.c',
>     'vpc.c',
>     'write-threshold.c',
> -), zstd, zlib)
> +), crypto, zstd, zlib)
>   
>   softmmu_ss.add(when: 'CONFIG_TCG', if_true: files('blkreplay.c'))
>   
> diff --git a/hw/nvram/meson.build b/hw/nvram/meson.build
> index fd2951a860..1f2ed013b2 100644
> --- a/hw/nvram/meson.build
> +++ b/hw/nvram/meson.build
> @@ -1,6 +1,3 @@
> -# QOM interfaces must be available anytime QOM is used.
> -qom_ss.add(files('fw_cfg-interface.c'))
> -
>   softmmu_ss.add(files('fw_cfg.c'))
>   softmmu_ss.add(when: 'CONFIG_CHRP_NVRAM', if_true: files('chrp_nvram.c'))
>   softmmu_ss.add(when: 'CONFIG_DS1225Y', if_true: files('ds1225y.c'))
> diff --git a/io/meson.build b/io/meson.build
> index bcd8b1e737..a844271b17 100644
> --- a/io/meson.build
> +++ b/io/meson.build
> @@ -12,4 +12,4 @@ io_ss.add(files(
>     'dns-resolver.c',
>     'net-listener.c',
>     'task.c',
> -))
> +), crypto)
> diff --git a/meson.build b/meson.build
> index 372576f82c..1a8c653067 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1538,6 +1538,34 @@ libqemuutil = static_library('qemuutil',
>   qemuutil = declare_dependency(link_with: libqemuutil,
>                                 sources: genh + version_res)
>   
> +# QOM interfaces must be available anytime QOM is used.
> +qom_ss.add(files('hw/nvram/fw_cfg-interface.c'))
> +qom_ss = qom_ss.apply(config_host, strict: false)
> +libqom = static_library('qom', qom_ss.sources() + genh,
> +                        dependencies: [qom_ss.dependencies()],
> +                        name_suffix: 'fa')
> +
> +qom = declare_dependency(link_whole: libqom)
> +
> +authz_ss = authz_ss.apply(config_host, strict: false)
> +libauthz = static_library('authz', authz_ss.sources() + genh,
> +                          dependencies: [authz_ss.dependencies()],
> +                          name_suffix: 'fa',
> +                          build_by_default: false)
> +
> +authz = declare_dependency(link_whole: libauthz,
> +                           dependencies: qom)
> +
> +crypto_ss.add(authz)
> +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: crypto_ss.dependencies())
> +
>   decodetree = generator(find_program('scripts/decodetree.py'),
>                          output: 'decode-@BASENAME@.c.inc',
>                          arguments: ['@INPUT@', '@EXTRA_ARGS@', '-o', 
> '@OUTPUT@'])
> @@ -1652,31 +1680,6 @@ qemu_syms = custom_target('qemu.syms', output: 
> 'qemu.syms',
>                                capture: true,
>                                command: [undefsym, nm, '@INPUT@'])
>   
> -qom_ss = qom_ss.apply(config_host, strict: false)
> -libqom = static_library('qom', qom_ss.sources() + genh,
> -                        dependencies: [qom_ss.dependencies()],
> -                        name_suffix: 'fa')
> -
> -qom = declare_dependency(link_whole: libqom)
> -
> -authz_ss = authz_ss.apply(config_host, strict: false)
> -libauthz = static_library('authz', authz_ss.sources() + genh,
> -                          dependencies: [authz_ss.dependencies()],
> -                          name_suffix: 'fa',
> -                          build_by_default: false)
> -
> -authz = declare_dependency(link_whole: libauthz,
> -                           dependencies: qom)
> -
> -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)
>   libio = static_library('io', io_ss.sources() + genh,
>                          dependencies: [io_ss.dependencies()],