modules/*/meson.build: add missing dependencies

diff --git a/.github/workflows/macOS.yaml b/.github/workflows/macOS.yaml
index fd834883a4a5be70478fcd7c04ebf2620f3fe2f9..f7fe0907aff84fa1dab0fcc3d4b62fcb00dd6be5 100644 (file)
--- a/.github/workflows/macOS.yaml
+++ b/.github/workflows/macOS.yaml
@@ -47,4 +47,6 @@ jobs:
         env:
           MALLOC_CHECK_: 3
           MALLOC_PERTURB_: 223
-        run: echo "quit()" | ${HOME}/.local/usr/sbin/kresd -a 127.0.0.1@53535 .
+        run: |
+          export DYLD_FALLBACK_LIBRARY_PATH="${DYLD_FALLBACK_LIBRARY_PATH}:${HOME}/.local/usr/lib/"
+          echo "quit()" | ${HOME}/.local/usr/sbin/kresd -a 127.0.0.1@53535 .

diff --git a/modules/bogus_log/meson.build b/modules/bogus_log/meson.build
index e2faed58125672a28210cceb57abeae882d8d21f..3fa8d3cfc6dcbdc65f476dcb0cbc8547cd69bba5 100644 (file)
--- a/modules/bogus_log/meson.build
+++ b/modules/bogus_log/meson.build
@@ -9,7 +9,7 @@ c_src_lint += bogus_log_src
 bogus_log_mod = shared_module(
   'bogus_log',
   bogus_log_src,
-  dependencies: libknot,
+  dependencies: mod_deps,
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,

diff --git a/modules/dnstap/meson.build b/modules/dnstap/meson.build
index e8a94bf116bb29e17a35a19cc44b440fa51aa8bc..038bf3e3db7f502fa1b178a2ea23a132e6f4f075 100644 (file)
--- a/modules/dnstap/meson.build
+++ b/modules/dnstap/meson.build
@@ -43,11 +43,10 @@ if build_dnstap
   dnstap_mod = shared_module(
     'dnstap',
     dnstap_src,
-    dependencies: [
+    dependencies: mod_deps + [
       declare_dependency(sources: dnstap_pb),
       libfstrm,
       libprotobuf_c,
-      libknot,
     ],
     include_directories: mod_inc_dir,
     name_prefix: '',

diff --git a/modules/edns_keepalive/meson.build b/modules/edns_keepalive/meson.build
index d125ec4589212e378fa2f18bd9e679e04b9a002c..8370cdb1b6565c42777e70538fcd5aa782ea4fab 100644 (file)
--- a/modules/edns_keepalive/meson.build
+++ b/modules/edns_keepalive/meson.build
@@ -9,7 +9,7 @@ c_src_lint += edns_keepalive_src
 edns_keepalive_mod = shared_module(
   'edns_keepalive',
   edns_keepalive_src,
-  dependencies: libknot,
+  dependencies: mod_deps,
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,

diff --git a/modules/extended_error/meson.build b/modules/extended_error/meson.build
index 15a1772f6e0a04b39197892122b6ea7db9794ca7..9de514af8ffb1870b2710c66e68aadc1466411a4 100644 (file)
--- a/modules/extended_error/meson.build
+++ b/modules/extended_error/meson.build
@@ -9,9 +9,7 @@ c_src_lint += extended_error_src
 extended_error_mod = shared_module(
   'extended_error',
   extended_error_src,
-  dependencies: [
-    libknot,
-  ],
+  dependencies: mod_deps,
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,

diff --git a/modules/hints/meson.build b/modules/hints/meson.build
index b83791813b943239f5c1cd950ddf8040828e3f6e..d5046cb4f0f5a00645e69d626ee279152aac9831 100644 (file)
--- a/modules/hints/meson.build
+++ b/modules/hints/meson.build
@@ -9,10 +9,7 @@ c_src_lint += hints_src
 hints_mod = shared_module(
   'hints',
   hints_src,
-  dependencies: [
-    libknot,
-    luajit,
-  ],
+  dependencies: mod_deps,
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,

diff --git a/modules/http/meson.build b/modules/http/meson.build
index a36e9ebd7ea8fc1607c5fce6d2a62de766a8e631..9d20c9294b34bb973d2085258a6f8425402847b4 100644 (file)
--- a/modules/http/meson.build
+++ b/modules/http/meson.build
@@ -45,7 +45,7 @@ install_subdir(
 )
 
 # auxiliary debug library for HTTP module - doesn't compile on Cygwin
-if openssl.found() and host_machine.system() != 'cygwin'
+if openssl.found() and host_machine.system() not in [ 'cygwin', 'darwin' ]
   debug_opensslkeylog_mod = shared_module(
     'debug_opensslkeylog',
     ['debug_opensslkeylog.c'],

diff --git a/modules/meson.build b/modules/meson.build
index 38612254afcb4e27f7a54cbc578c7ad7fb99e8fc..48bd47813acfdebee35d127b23a5ffd3711aaf28 100644 (file)
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -35,6 +35,13 @@ integr_tests += [
 mod_inc_dir = include_directories('..', '../contrib',
   luajit.get_pkgconfig_variable('includedir'))
 
+mod_deps = [
+  contrib_dep,
+  libknot,
+  libuv,
+  luajit,
+]
+
 # handle more complex C/LUA modules separately
 subdir('bogus_log')
 # cookies module is not currently used

diff --git a/modules/nsid/meson.build b/modules/nsid/meson.build
index 354e70b9ec44770ff3e833920de7085589d4d4f9..3c418bc9539d987c73fdd8fcdb87bf3e5226f8bf 100644 (file)
--- a/modules/nsid/meson.build
+++ b/modules/nsid/meson.build
@@ -9,10 +9,7 @@ c_src_lint += nsid_src
 nsid_mod = shared_module(
   'nsid',
   nsid_src,
-  dependencies: [
-    libknot,
-    luajit,
-  ],
+  dependencies: mod_deps,
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,

diff --git a/modules/refuse_nord/meson.build b/modules/refuse_nord/meson.build
index 5142ded67385bc8ee279a1263ff8d611e5201c95..7dc8b888e1378ab881ee49a6fcb8ea16d1ef5421 100644 (file)
--- a/modules/refuse_nord/meson.build
+++ b/modules/refuse_nord/meson.build
@@ -13,7 +13,7 @@ c_src_lint += refuse_nord_src
 refuse_nord_mod = shared_module(
   'refuse_nord',
   refuse_nord_src,
-  dependencies: libknot,
+  dependencies: mod_deps,
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,

diff --git a/modules/stats/meson.build b/modules/stats/meson.build
index cb4ccd68904a8dc69373cf21ea1f223321e93e1a..e1f4a49ccad78a86fa90021ca6c0260b4856ac2a 100644 (file)
--- a/modules/stats/meson.build
+++ b/modules/stats/meson.build
@@ -14,9 +14,7 @@ integr_tests += [
 stats_mod = shared_module(
   'stats',
   stats_src,
-  dependencies: [
-    libknot,
-  ],
+  dependencies: mod_deps,
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,

diff --git a/tests/unit/meson.build b/tests/unit/meson.build
index b10789cc2a8448788e1a762fd787e5f4cdb5bfae..747f1d3b6bb22b9999791d608f2252262d0a7788 100644 (file)
--- a/tests/unit/meson.build
+++ b/tests/unit/meson.build
@@ -10,7 +10,7 @@ mock_cmodule_mod = shared_module(
   'mock_cmodule',
   mock_cmodule_src,
   name_prefix: '',
-  dependencies: libknot,
+  dependencies: mod_deps,
   include_directories: mod_inc_dir,
 )
 
@@ -20,10 +20,11 @@ foreach unit_test : unit_tests
     unit_test[0],
     unit_test[1],
     dependencies: [
+      cmocka,
       contrib_dep,
-      libkres_dep,
       libknot,
-      cmocka,
+      libkres_dep,
+      libuv,
       lmdb,
     ],
   )

diff --git a/utils/cache_gc/meson.build b/utils/cache_gc/meson.build
index 4c82b8dac07068d30eb5e068065f59a602098f75..6ed86afe3d9d30203dbc8a41f4725f87e66a2a9c 100644 (file)
--- a/utils/cache_gc/meson.build
+++ b/utils/cache_gc/meson.build
@@ -18,6 +18,8 @@ if build_utils
       contrib_dep,
       libkres_dep,
       libknot,
+      libuv,
+      lmdb,
     ],
     install: true,
     install_dir: get_option('sbindir'),