From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Wed, 13 Mar 2019 16:47:07 +0000 (+0100)
Subject: meson: use correct luajit includes from pkgconfig
X-Git-Tag: v4.0.0~19^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0b9524b7d6680f892671fc4e7a2e5c603848cf60;p=thirdparty%2Fknot-resolver.git

meson: use correct luajit includes from pkgconfig
---

diff --git a/meson.build b/meson.build
index b565f1790..8cb43d0c8 100644
--- a/meson.build
+++ b/meson.build
@@ -20,6 +20,9 @@ if not lmdb.found()  # darwin workaround: missing pkgconfig
 endif
 gnutls = dependency('gnutls')
 luajit = dependency('luajit')
+# NOTE avoid using link_args for luajit due to a macOS issue
+# https://github.com/Homebrew/homebrew-core/issues/37169
+luajit_inc = luajit.partial_dependency(compile_args: true, includes: true)
 message('------------------------------')
 
 
@@ -44,8 +47,7 @@ systemd_work_dir = ''
 run_dir = ''
 systemd_unit_dir = ''
 systemd_tmpfiles_dir = ''
-mod_inc_dir = include_directories('.', 'contrib/',
-  luajit.get_pkgconfig_variable('includedir'))
+mod_inc_dir = include_directories('.', 'contrib/')
 
 ## Trust anchors
 managed_ta = get_option('managed_ta') == 'enabled'
diff --git a/modules/hints/meson.build b/modules/hints/meson.build
index 2d3315e0c..aafa42998 100644
--- a/modules/hints/meson.build
+++ b/modules/hints/meson.build
@@ -8,6 +8,9 @@ c_src_lint += hints_src
 hints_mod = shared_module(
   'hints',
   hints_src,
+  dependencies: [
+    luajit_inc,
+  ],
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,
diff --git a/modules/nsid/meson.build b/modules/nsid/meson.build
index 003d4ee89..c7fbc2be8 100644
--- a/modules/nsid/meson.build
+++ b/modules/nsid/meson.build
@@ -8,6 +8,9 @@ c_src_lint += nsid_src
 nsid_mod = shared_module(
   'nsid',
   nsid_src,
+  dependencies: [
+    luajit_inc,
+  ],
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,
diff --git a/modules/policy/meson.build b/modules/policy/meson.build
index 7e347f13a..b883c546f 100644
--- a/modules/policy/meson.build
+++ b/modules/policy/meson.build
@@ -36,6 +36,9 @@ lua_ac_lib = shared_module(
     '-Wall',
     '-fPIC',
   ],
+  dependencies: [
+    luajit_inc,
+  ],
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,
diff --git a/modules/stats/meson.build b/modules/stats/meson.build
index 1eefb857f..60aac903c 100644
--- a/modules/stats/meson.build
+++ b/modules/stats/meson.build
@@ -13,6 +13,9 @@ integr_tests += [
 stats_mod = shared_module(
   'stats',
   stats_src,
+  dependencies: [
+    luajit_inc,
+  ],
   include_directories: mod_inc_dir,
   name_prefix: '',
   install: true,