mirror of
https://github.com/systemd/systemd
synced 2026-04-11 09:34:51 +02:00
Compare commits
2 Commits
34b5684846
...
cbf8fc90d5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cbf8fc90d5 | ||
|
|
9bcf483b11 |
@ -165,7 +165,7 @@
|
|||||||
} while (false)
|
} while (false)
|
||||||
|
|
||||||
#define LIST_JUST_US(name,item) \
|
#define LIST_JUST_US(name,item) \
|
||||||
(!(item)->name##_prev && !(item)->name##_next) \
|
(!(item)->name##_prev && !(item)->name##_next)
|
||||||
#define LIST_FOREACH(name,i,head) \
|
#define LIST_FOREACH(name,i,head) \
|
||||||
for ((i) = (head); (i); (i) = (i)->name##_next)
|
for ((i) = (head); (i); (i) = (i)->name##_next)
|
||||||
#define LIST_FOREACH_SAFE(name,i,n,head) \
|
#define LIST_FOREACH_SAFE(name,i,n,head) \
|
||||||
|
|||||||
@ -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))
|
opt == 'openssl' or (opt == 'auto' and conf.get('HAVE_OPENSSL') == 1 and conf.get('HAVE_GCRYPT') == 0))
|
||||||
conf.set10('HAVE_OPENSSL_OR_GCRYPT',
|
conf.set10('HAVE_OPENSSL_OR_GCRYPT',
|
||||||
conf.get('HAVE_OPENSSL') == 1 or conf.get('HAVE_GCRYPT') == 1)
|
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')
|
dns_over_tls = get_option('dns-over-tls')
|
||||||
if dns_over_tls != 'false'
|
if dns_over_tls != 'false'
|
||||||
@ -2200,7 +2200,6 @@ if conf.get('ENABLE_RESOLVE') == 1
|
|||||||
libsystemd_resolve_core],
|
libsystemd_resolve_core],
|
||||||
dependencies : [threads,
|
dependencies : [threads,
|
||||||
lib_openssl_or_gcrypt,
|
lib_openssl_or_gcrypt,
|
||||||
libgpg_error,
|
|
||||||
libm,
|
libm,
|
||||||
libidn],
|
libidn],
|
||||||
install_rpath : rootlibexecdir,
|
install_rpath : rootlibexecdir,
|
||||||
|
|||||||
@ -134,7 +134,7 @@
|
|||||||
} while (false)
|
} while (false)
|
||||||
|
|
||||||
#define LIST_JUST_US(name,item) \
|
#define LIST_JUST_US(name,item) \
|
||||||
(!(item)->name##_prev && !(item)->name##_next) \
|
(!(item)->name##_prev && !(item)->name##_next)
|
||||||
|
|
||||||
#define LIST_FOREACH(name,i,head) \
|
#define LIST_FOREACH(name,i,head) \
|
||||||
for ((i) = (head); (i); (i) = (i)->name##_next)
|
for ((i) = (head); (i); (i) = (i)->name##_next)
|
||||||
|
|||||||
@ -135,7 +135,7 @@ systemd_resolved_sources += custom_target(
|
|||||||
output : 'resolved-dnssd-gperf.c',
|
output : 'resolved-dnssd-gperf.c',
|
||||||
command : [gperf, '@INPUT@', '--output-file', '@OUTPUT@'])
|
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('ENABLE_DNS_OVER_TLS') == 1
|
||||||
if conf.get('DNS_OVER_TLS_USE_GNUTLS') == 1
|
if conf.get('DNS_OVER_TLS_USE_GNUTLS') == 1
|
||||||
systemd_resolved_sources += files(
|
systemd_resolved_sources += files(
|
||||||
@ -178,14 +178,12 @@ tests += [
|
|||||||
[libsystemd_resolve_core,
|
[libsystemd_resolve_core,
|
||||||
libshared],
|
libshared],
|
||||||
[lib_openssl_or_gcrypt,
|
[lib_openssl_or_gcrypt,
|
||||||
libgpg_error,
|
|
||||||
libm]],
|
libm]],
|
||||||
|
|
||||||
[['src/resolve/test-dns-packet.c'],
|
[['src/resolve/test-dns-packet.c'],
|
||||||
[libsystemd_resolve_core,
|
[libsystemd_resolve_core,
|
||||||
libshared],
|
libshared],
|
||||||
[lib_openssl_or_gcrypt,
|
[lib_openssl_or_gcrypt,
|
||||||
libgpg_error,
|
|
||||||
libm]],
|
libm]],
|
||||||
|
|
||||||
[['src/resolve/test-resolved-etc-hosts.c',
|
[['src/resolve/test-resolved-etc-hosts.c',
|
||||||
@ -194,21 +192,18 @@ tests += [
|
|||||||
[libsystemd_resolve_core,
|
[libsystemd_resolve_core,
|
||||||
libshared],
|
libshared],
|
||||||
[lib_openssl_or_gcrypt,
|
[lib_openssl_or_gcrypt,
|
||||||
libgpg_error,
|
|
||||||
libm]],
|
libm]],
|
||||||
|
|
||||||
[['src/resolve/test-resolved-packet.c'],
|
[['src/resolve/test-resolved-packet.c'],
|
||||||
[libsystemd_resolve_core,
|
[libsystemd_resolve_core,
|
||||||
libshared],
|
libshared],
|
||||||
[lib_openssl_or_gcrypt,
|
[lib_openssl_or_gcrypt,
|
||||||
libgpg_error,
|
|
||||||
libm]],
|
libm]],
|
||||||
|
|
||||||
[['src/resolve/test-dnssec.c'],
|
[['src/resolve/test-dnssec.c'],
|
||||||
[libsystemd_resolve_core,
|
[libsystemd_resolve_core,
|
||||||
libshared],
|
libshared],
|
||||||
[lib_openssl_or_gcrypt,
|
[lib_openssl_or_gcrypt,
|
||||||
libgpg_error,
|
|
||||||
libm],
|
libm],
|
||||||
[], 'HAVE_OPENSSL_OR_GCRYPT'],
|
[], 'HAVE_OPENSSL_OR_GCRYPT'],
|
||||||
|
|
||||||
@ -216,7 +211,6 @@ tests += [
|
|||||||
[libsystemd_resolve_core,
|
[libsystemd_resolve_core,
|
||||||
libshared],
|
libshared],
|
||||||
[lib_openssl_or_gcrypt,
|
[lib_openssl_or_gcrypt,
|
||||||
libgpg_error,
|
|
||||||
libm],
|
libm],
|
||||||
[], '', 'manual'],
|
[], '', 'manual'],
|
||||||
]
|
]
|
||||||
@ -226,6 +220,5 @@ fuzzers += [
|
|||||||
[libsystemd_resolve_core,
|
[libsystemd_resolve_core,
|
||||||
libshared],
|
libshared],
|
||||||
[lib_openssl_or_gcrypt,
|
[lib_openssl_or_gcrypt,
|
||||||
libgpg_error,
|
|
||||||
libm]],
|
libm]],
|
||||||
]
|
]
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user