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

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.

diff --git a/meson.build b/meson.build
index c0cbadecb1238bf1f0bc769c8375543a79d56b86..0b7c1918ad4c7ab4d63047ac8e4992ba548b2fdc 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -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,

diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index 0580fbeec625db19fe273c2ce5df84510b1b46a9..2cdf24b1cbef309ed32b9ee499cc2c43a744b8a2 100644 (file)
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -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]],
 ]