system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-02 22:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: fix build with -Dcryptolib=openssl -Ddns-over-tls=false

Browse source 
Previously, when -Ddns-over-tls=false, libopenssl was missing in the
dependency of resolved.
Also, this drops libgpg_error when it is not necessary.

Replaces #21878.
This commit is contained in:
Yu Watanabe 2021-12-24 10:06:13 +09:00 committed by Frantisek Sumsal
parent 34b5684846
commit 9bcf483b11
2 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
meson.build
View file

@ -1474,7 +1474,7 @@ conf.set10('PREFER_OPENSSL',
opt == 'openssl' or (opt == 'auto' and conf.get('HAVE_OPENSSL') == 1 and conf.get('HAVE_GCRYPT') == 0))
conf.set10('HAVE_OPENSSL_OR_GCRYPT',
conf.get('HAVE_OPENSSL') == 1 or conf.get('HAVE_GCRYPT') == 1)
lib_openssl_or_gcrypt = conf.get('PREFER_OPENSSL') == 1 ? libopenssl : libgcrypt
lib_openssl_or_gcrypt = conf.get('PREFER_OPENSSL') == 1 ? [libopenssl] : [libgcrypt, libgpg_error]
dns_over_tls = get_option('dns-over-tls')
if dns_over_tls != 'false'
@ -2200,7 +2200,6 @@ if conf.get('ENABLE_RESOLVE') == 1
libsystemd_resolve_core],
dependencies : [threads,
lib_openssl_or_gcrypt,
libgpg_error,
libm,
libidn],
install_rpath : rootlibexecdir,

9
src/resolve/meson.build
View file

@ -135,7 +135,7 @@ systemd_resolved_sources += custom_target(
output : 'resolved-dnssd-gperf.c',
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
systemd_resolved_dependencies = [threads, libgpg_error, libm]
systemd_resolved_dependencies = [threads, libm] + [lib_openssl_or_gcrypt]
if conf.get('ENABLE_DNS_OVER_TLS') == 1
if conf.get('DNS_OVER_TLS_USE_GNUTLS') == 1
systemd_resolved_sources += files(
@ -178,14 +178,12 @@ tests += [
[libsystemd_resolve_core,
libshared],
[lib_openssl_or_gcrypt,
libgpg_error,
libm]],
[['src/resolve/test-dns-packet.c'],
[libsystemd_resolve_core,
libshared],
[lib_openssl_or_gcrypt,
libgpg_error,
libm]],
[['src/resolve/test-resolved-etc-hosts.c',
@ -194,21 +192,18 @@ tests += [
[libsystemd_resolve_core,
libshared],
[lib_openssl_or_gcrypt,
libgpg_error,
libm]],
[['src/resolve/test-resolved-packet.c'],
[libsystemd_resolve_core,
libshared],
[lib_openssl_or_gcrypt,
libgpg_error,
libm]],
[['src/resolve/test-dnssec.c'],
[libsystemd_resolve_core,
libshared],
[lib_openssl_or_gcrypt,
libgpg_error,
libm],
[], 'HAVE_OPENSSL_OR_GCRYPT'],
@ -216,7 +211,6 @@ tests += [
[libsystemd_resolve_core,
libshared],
[lib_openssl_or_gcrypt,
libgpg_error,
libm],
[], '', 'manual'],
]
@ -226,6 +220,5 @@ fuzzers += [
[libsystemd_resolve_core,
libshared],
[lib_openssl_or_gcrypt,
libgpg_error,
libm]],
]