Skip to content
Snippets Groups Projects
Verified Commit 15742580 authored by Vladimír Čunát's avatar Vladimír Čunát
Browse files

Revert "meson: use correct luajit includes from pkgconfig"

This reverts commit 0b9524b7.

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.
parent 8c94968e
No related merge requests found
......@@ -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'
......
......@@ -11,7 +11,6 @@ extended_error_mod = shared_module(
extended_error_src,
dependencies: [
libknot,
luajit_inc,
],
include_directories: mod_inc_dir,
name_prefix: '',
......
......@@ -11,7 +11,6 @@ hints_mod = shared_module(
hints_src,
dependencies: [
libknot,
luajit_inc,
],
include_directories: mod_inc_dir,
name_prefix: '',
......
......@@ -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')
......
......@@ -11,7 +11,6 @@ nsid_mod = shared_module(
nsid_src,
dependencies: [
libknot,
luajit_inc,
],
include_directories: mod_inc_dir,
name_prefix: '',
......
......@@ -40,9 +40,6 @@ lua_ac_lib = shared_module(
'-Wall',
'-fPIC',
],
dependencies: [
luajit_inc,
],
include_directories: mod_inc_dir,
name_prefix: '',
install: true,
......
......@@ -16,7 +16,6 @@ stats_mod = shared_module(
stats_src,
dependencies: [
libknot,
luajit_inc,
],
include_directories: mod_inc_dir,
name_prefix: '',
......
......@@ -18,7 +18,6 @@ if build_utils
contrib_dep,
libkres_dep,
libknot,
luajit_inc,
],
install: true,
install_dir: get_option('sbindir'),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment