From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 6 Feb 2023 14:17:53 +0000 (+0100)
Subject: Revert "meson: use correct luajit includes from pkgconfig"
X-Git-Tag: v5.7.0~13^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b6df073db13461edc8b3387ff17dafe1111b920;p=thirdparty%2Fknot-resolver.git

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 795947e17..dc14d406f 100644
--- 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 26e87b0c6..0a0b3fd3e 100644
--- 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 0a0945cf5..0a1f35c4f 100644
--- 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 c5360c8bb..38612254a 100644
--- 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 b0fcd9e24..70d9a7ddf 100644
--- 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 37f168399..9ff1a6593 100644
--- 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 4f2d41e8f..5a3e8e932 100644
--- 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 02ab6c639..40e127d2d 100644
--- 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'),