meson: use correct luajit includes from pkgconfig

diff --git a/meson.build b/meson.build
index b565f1790a3f2c90a9d52d258ae1340b3c57400c..8cb43d0c85eaffc650b7eb7a36405c257bb5e3fe 100644 (file)
--- 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 2d3315e0c4aeb6562114bfb2857553ced44ae8e8..aafa42998de78f18136176a163d0471eeba4cc43 100644 (file)
--- 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 003d4ee89b494bc22cf3b2c325ab671ea706d3bb..c7fbc2be89b9ec96dbe03937ecf6ce96874b5fdf 100644 (file)
--- 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 7e347f13a9907a35407668a865d8d3f5e9f72637..b883c546fcd499e5d1e77b1fa4c5a3ff5c1aba6a 100644 (file)
--- 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 1eefb857f5a1fafd025110d9c3b74b1fa981a908..60aac903c8844cc6796cf3b3ac1046bf44848ac4 100644 (file)
--- 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,