From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 3 Dec 2021 12:11:01 +0000 (+0100)
Subject: meson: drop libgcrypt dep from resolved tests
X-Git-Tag: v250-rc1~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7bd34cd64d2ef65770c84e348a42d1d0bcb2f9e;p=thirdparty%2Fsystemd.git

meson: drop libgcrypt dep from resolved tests

Follow-up for pull request #21170.

I hoped that we would drop libgcrypt fully and drop all references to the
library in meson, but this doesn't seem feasible (because of the use in
sd-journal). But let's remove it here, all the resolved code has been switched
to work either of the two libraries.
---

diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index d4534cb4a9d..4d717f19641 100644
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -177,7 +177,6 @@ tests += [
          [libsystemd_resolve_core,
           libshared],
          [lib_openssl_or_gcrypt,
-          libgcrypt,
           libgpg_error,
           libm]],
 
@@ -185,7 +184,6 @@ tests += [
          [libsystemd_resolve_core,
           libshared],
          [lib_openssl_or_gcrypt,
-          libgcrypt,
           libgpg_error,
           libm]],
 
@@ -195,7 +193,6 @@ tests += [
          [libsystemd_resolve_core,
           libshared],
          [lib_openssl_or_gcrypt,
-          libgcrypt,
           libgpg_error,
           libm]],
 
@@ -203,7 +200,6 @@ tests += [
          [libsystemd_resolve_core,
           libshared],
          [lib_openssl_or_gcrypt,
-          libgcrypt,
           libgpg_error,
           libm]],
 
@@ -211,7 +207,6 @@ tests += [
          [libsystemd_resolve_core,
           libshared],
          [lib_openssl_or_gcrypt,
-          libgcrypt,
           libgpg_error,
           libm],
          [], 'HAVE_OPENSSL_OR_GCRYPT'],
@@ -220,7 +215,6 @@ tests += [
          [libsystemd_resolve_core,
           libshared],
          [lib_openssl_or_gcrypt,
-          libgcrypt,
           libgpg_error,
           libm],
          [], '', 'manual'],
@@ -231,7 +225,6 @@ fuzzers += [
          [libsystemd_resolve_core,
           libshared],
          [lib_openssl_or_gcrypt,
-          libgcrypt,
           libgpg_error,
           libm]],
 ]