diff options
| author | Vladimír Čunát <vladimir.cunat@nic.cz> | 2023-02-06 15:17:53 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vladimir.cunat@nic.cz> | 2023-03-08 11:02:44 +0100 |
| commit | 2b6df073db13461edc8b3387ff17dafe1111b920 (patch) | |
| tree | 20e3b45f92f7224b0160dd31350544c958baff7b /modules | |
| parent | Merge !1388: daemon/engine: warning when log_groups contains a non-existent g... (diff) | |
| download | knot-resolver-2b6df073db13461edc8b3387ff17dafe1111b920.tar.xz knot-resolver-2b6df073db13461edc8b3387ff17dafe1111b920.zip | |
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.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/extended_error/meson.build | 1 | ||||
| -rw-r--r-- | modules/hints/meson.build | 1 | ||||
| -rw-r--r-- | modules/meson.build | 2 | ||||
| -rw-r--r-- | modules/nsid/meson.build | 1 | ||||
| -rw-r--r-- | modules/policy/meson.build | 3 | ||||
| -rw-r--r-- | modules/stats/meson.build | 1 |
6 files changed, 2 insertions, 7 deletions
diff --git a/modules/extended_error/meson.build b/modules/extended_error/meson.build index 26e87b0c..0a0b3fd3 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 0a0945cf..0a1f35c4 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 c5360c8b..38612254 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 b0fcd9e2..70d9a7dd 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 37f16839..9ff1a659 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 4f2d41e8..5a3e8e93 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: '', |