Skip to content
Snippets Groups Projects
Verified Commit 0b9524b7 authored by Tomas Krizek's avatar Tomas Krizek
Browse files

meson: use correct luajit includes from pkgconfig

parent a9724192
Branches
Tags
1 merge request!789meson: use correct luajit includes from pkgconfig
Pipeline #46458 failed with stages
in 5 minutes and 44 seconds
......@@ -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'
......
......@@ -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,
......
......@@ -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,
......
......@@ -36,6 +36,9 @@ lua_ac_lib = shared_module(
'-Wall',
'-fPIC',
],
dependencies: [
luajit_inc,
],
include_directories: mod_inc_dir,
name_prefix: '',
install: true,
......
......@@ -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,
......
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