Fix building on Cygwin

This commit adds support for building on Cygwin/MSYS2.

Signed-off-by: Christopher Ng <facboy@gmail.com>

diff --git a/meson.build b/meson.build
index dc14d406fd04620af1fbebabe7824203c6e48923..3f301e5a7eb1bf01a70f6b22f630a8b57d8091f5 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -38,6 +38,8 @@ libkres_soversion = 9
 libext = '.so'
 if host_machine.system() == 'darwin'
   libext = '.dylib'
+elif host_machine.system() == 'cygwin'
+  libext = '.dll'
 endif
 
 ## Paths

diff --git a/modules/bogus_log/meson.build b/modules/bogus_log/meson.build
index 2dcf87f46dd30116881857b376afab468d5c8b3e..e2faed58125672a28210cceb57abeae882d8d21f 100644 (file)
--- a/modules/bogus_log/meson.build
+++ b/modules/bogus_log/meson.build
@@ -14,6 +14,7 @@ bogus_log_mod = shared_module(
   name_prefix: '',
   install: true,
   install_dir: modules_dir,
+  link_with: kresd,
 )
 
 integr_tests += [

diff --git a/modules/edns_keepalive/meson.build b/modules/edns_keepalive/meson.build
index 979452ff134d0630b65072cc37c3a7554d99cb73..d125ec4589212e378fa2f18bd9e679e04b9a002c 100644 (file)
--- a/modules/edns_keepalive/meson.build
+++ b/modules/edns_keepalive/meson.build
@@ -14,4 +14,5 @@ edns_keepalive_mod = shared_module(
   name_prefix: '',
   install: true,
   install_dir: modules_dir,
+  link_with: kresd,
 )

diff --git a/modules/extended_error/meson.build b/modules/extended_error/meson.build
index 0a0b3fd3eda251b3ab1b4c60e08493b13bab460b..15a1772f6e0a04b39197892122b6ea7db9794ca7 100644 (file)
--- a/modules/extended_error/meson.build
+++ b/modules/extended_error/meson.build
@@ -16,4 +16,5 @@ extended_error_mod = shared_module(
   name_prefix: '',
   install: true,
   install_dir: modules_dir,
+  link_with: kresd,
 )

diff --git a/modules/hints/meson.build b/modules/hints/meson.build
index 0a1f35c4f2be25337d5498a4946cdef005d0ba5e..b83791813b943239f5c1cd950ddf8040828e3f6e 100644 (file)
--- a/modules/hints/meson.build
+++ b/modules/hints/meson.build
@@ -11,11 +11,13 @@ hints_mod = shared_module(
   hints_src,
   dependencies: [
     libknot,
+    luajit,
   ],
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,
   install_dir: modules_dir,
+  link_with: kresd,
 )
 
 config_tests += [

diff --git a/modules/http/meson.build b/modules/http/meson.build
index 6705143c3b39251c006d0485640c6a7fb2e90d09..a36e9ebd7ea8fc1607c5fce6d2a62de766a8e631 100644 (file)
--- a/modules/http/meson.build
+++ b/modules/http/meson.build
@@ -44,8 +44,8 @@ install_subdir(
   install_dir: modules_dir / 'http',
 )
 
-# auxiliary debug library for HTTP module
-if openssl.found()
+# auxiliary debug library for HTTP module - doesn't compile on Cygwin
+if openssl.found() and host_machine.system() != 'cygwin'
   debug_opensslkeylog_mod = shared_module(
     'debug_opensslkeylog',
     ['debug_opensslkeylog.c'],

diff --git a/modules/nsid/meson.build b/modules/nsid/meson.build
index 70d9a7ddfbc63fc1481638f729f453a643b9c60c..354e70b9ec44770ff3e833920de7085589d4d4f9 100644 (file)
--- a/modules/nsid/meson.build
+++ b/modules/nsid/meson.build
@@ -11,11 +11,13 @@ nsid_mod = shared_module(
   nsid_src,
   dependencies: [
     libknot,
+    luajit,
   ],
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,
   install_dir: modules_dir,
+  link_with: kresd,
 )
 
 config_tests += [

diff --git a/modules/policy/lua-aho-corasick b/modules/policy/lua-aho-corasick
index 88f08a8777ab231b259e008507879806cd9f268b..9f983c48af8ddddbcc38f34a4d589600b47645c1 160000 (submodule)
--- a/modules/policy/lua-aho-corasick
+++ b/modules/policy/lua-aho-corasick
@@ -1 +1 @@
-Subproject commit 88f08a8777ab231b259e008507879806cd9f268b
+Subproject commit 9f983c48af8ddddbcc38f34a4d589600b47645c1

diff --git a/modules/policy/meson.build b/modules/policy/meson.build
index 9ff1a659350422d23c92fded62f3cd8c7b7cb8f7..0d1dcfb48d662ab621db9802c5e4cc9c23a7da1b 100644 (file)
--- a/modules/policy/meson.build
+++ b/modules/policy/meson.build
@@ -40,8 +40,12 @@ lua_ac_lib = shared_module(
     '-Wall',
     '-fPIC',
   ],
+  dependencies: [
+    luajit,
+  ],
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,
   install_dir: lib_dir,
+  link_with: kresd,
 )

diff --git a/modules/refuse_nord/meson.build b/modules/refuse_nord/meson.build
index 1bcdbd72c302440c18112078c03b1e6b6f61b121..5142ded67385bc8ee279a1263ff8d611e5201c95 100644 (file)
--- a/modules/refuse_nord/meson.build
+++ b/modules/refuse_nord/meson.build
@@ -18,4 +18,5 @@ refuse_nord_mod = shared_module(
   name_prefix: '',
   install: true,
   install_dir: modules_dir,
+  link_with: kresd,
 )

diff --git a/modules/stats/meson.build b/modules/stats/meson.build
index 5a3e8e932e8001287e83492844d60d1e8d8196b0..cb4ccd68904a8dc69373cf21ea1f223321e93e1a 100644 (file)
--- a/modules/stats/meson.build
+++ b/modules/stats/meson.build
@@ -21,4 +21,5 @@ stats_mod = shared_module(
   name_prefix: '',
   install: true,
   install_dir: modules_dir,
+  link_with: kresd,
 )