Revert "meson: use correct luajit includes from pkgconfig"

This reverts commit 0b9524b7d6680f892671fc4e7a2e5c603848cf60.

The hack shouldn't be needed anymore:
https://github.com/Homebrew/homebrew-core/commit/4369052170f4360b7ad545f23b8a01a4ccb37683#diff-59a7902ada251dd9dba99b5bd323c1dba1d102d244ce766c06ce00097fb82e8fL71

This isn't an exact revert, but differences are minor.

diff --git a/meson.build b/meson.build
index 795947e17888585ab01422c06cd1bb6ad38ef51f..dc14d406fd04620af1fbebabe7824203c6e48923 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -29,9 +29,6 @@ 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('------------------------------')
 
 
@@ -59,7 +56,6 @@ systemd_cache_dir = prefix / get_option('localstatedir') / 'cache' / 'knot-resol
 systemd_unit_dir = prefix / 'lib' / 'systemd' / 'system'
 systemd_tmpfiles_dir = prefix / 'lib' / 'tmpfiles.d'
 systemd_sysusers_dir = prefix / 'lib' / 'sysusers.d'
-mod_inc_dir = include_directories('.', 'contrib/')
 
 ## Trust anchors
 managed_ta = get_option('managed_ta') == 'enabled'

diff --git a/modules/extended_error/meson.build b/modules/extended_error/meson.build
index 26e87b0c6f56b88e71a882d1ef5a631ff68fa8c8..0a0b3fd3eda251b3ab1b4c60e08493b13bab460b 100644 (file)
--- a/modules/extended_error/meson.build
+++ b/modules/extended_error/meson.build
@@ -11,7 +11,6 @@ extended_error_mod = shared_module(
   extended_error_src,
   dependencies: [
     libknot,
-    luajit_inc,
   ],
   include_directories: mod_inc_dir,
   name_prefix: '',

diff --git a/modules/hints/meson.build b/modules/hints/meson.build
index 0a0945cf5b7041e45cef299f6e0d4ba4c14583c1..0a1f35c4f2be25337d5498a4946cdef005d0ba5e 100644 (file)
--- a/modules/hints/meson.build
+++ b/modules/hints/meson.build
@@ -11,7 +11,6 @@ hints_mod = shared_module(
   hints_src,
   dependencies: [
     libknot,
-    luajit_inc,
   ],
   include_directories: mod_inc_dir,
   name_prefix: '',

diff --git a/modules/meson.build b/modules/meson.build
index c5360c8bbd1bf22816c96e30b494bd38ce91d7e4..38612254afcb4e27f7a54cbc578c7ad7fb99e8fc 100644 (file)
--- a/modules/meson.build
+++ b/modules/meson.build
@@ -32,6 +32,8 @@ integr_tests += [
   ['serve_stale', meson.current_source_dir() / 'serve_stale' / 'test.integr'],
 ]
 
+mod_inc_dir = include_directories('..', '../contrib',
+  luajit.get_pkgconfig_variable('includedir'))
 
 # handle more complex C/LUA modules separately
 subdir('bogus_log')

diff --git a/modules/nsid/meson.build b/modules/nsid/meson.build
index b0fcd9e24fd1a0172f9f01b2da6324690f84f1d0..70d9a7ddfbc63fc1481638f729f453a643b9c60c 100644 (file)
--- a/modules/nsid/meson.build
+++ b/modules/nsid/meson.build
@@ -11,7 +11,6 @@ nsid_mod = shared_module(
   nsid_src,
   dependencies: [
     libknot,
-    luajit_inc,
   ],
   include_directories: mod_inc_dir,
   name_prefix: '',

diff --git a/modules/policy/meson.build b/modules/policy/meson.build
index 37f168399727aeff3000cb8793c9a0a0c804394b..9ff1a659350422d23c92fded62f3cd8c7b7cb8f7 100644 (file)
--- a/modules/policy/meson.build
+++ b/modules/policy/meson.build
@@ -40,9 +40,6 @@ 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 4f2d41e8fd9a38c4fbc6f209177b1382357dee70..5a3e8e932e8001287e83492844d60d1e8d8196b0 100644 (file)
--- a/modules/stats/meson.build
+++ b/modules/stats/meson.build
@@ -16,7 +16,6 @@ stats_mod = shared_module(
   stats_src,
   dependencies: [
     libknot,
-    luajit_inc,
   ],
   include_directories: mod_inc_dir,
   name_prefix: '',

diff --git a/utils/cache_gc/meson.build b/utils/cache_gc/meson.build
index 02ab6c639399017d6150a6a772d35f15721c1aed..40e127d2dcfbbe56f9e1ef75baee15ba6984b9fa 100644 (file)
--- a/utils/cache_gc/meson.build
+++ b/utils/cache_gc/meson.build
@@ -18,7 +18,6 @@ if build_utils
       contrib_dep,
       libkres_dep,
       libknot,
-      luajit_inc,
     ],
     install: true,
     install_dir: get_option('sbindir'),