From 1b302abdcd04c1eab2924a3bc5cdc69d274a2878 Mon Sep 17 00:00:00 2001
From: Christopher Ng <facboy@gmail.com>
Date: Sun, 25 Dec 2022 14:23:07 +0000
Subject: [PATCH] Fix building on Cygwin

This commit adds support for building on Cygwin/MSYS2.

Signed-off-by: Christopher Ng <facboy@gmail.com>
---
 meson.build                        | 2 ++
 modules/bogus_log/meson.build      | 1 +
 modules/edns_keepalive/meson.build | 1 +
 modules/extended_error/meson.build | 1 +
 modules/hints/meson.build          | 2 ++
 modules/http/meson.build           | 4 ++--
 modules/nsid/meson.build           | 2 ++
 modules/policy/lua-aho-corasick    | 2 +-
 modules/policy/meson.build         | 4 ++++
 modules/refuse_nord/meson.build    | 1 +
 modules/stats/meson.build          | 1 +
 11 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index dc14d406f..3f301e5a7 100644
--- 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 2dcf87f46..e2faed581 100644
--- 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 979452ff1..d125ec458 100644
--- 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 0a0b3fd3e..15a1772f6 100644
--- 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 0a1f35c4f..b83791813 100644
--- 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 6705143c3..a36e9ebd7 100644
--- 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 70d9a7ddf..354e70b9e 100644
--- 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 88f08a877..9f983c48a 160000
--- 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 9ff1a6593..0d1dcfb48 100644
--- 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 1bcdbd72c..5142ded67 100644
--- 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 5a3e8e932..cb4ccd689 100644
--- 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,
 )
-- 
2.47.2