Commit f5697b2c authored by Tomas Krizek's avatar Tomas Krizek

meson: fix build on OSX

parent ee1cbabf
......@@ -9,7 +9,6 @@ addons:
- libuv
- lmdb
- meson
update: true
compiler:
- clang
notifications:
......@@ -20,7 +19,7 @@ matrix:
fast_finish: true
env:
global:
- KNOT_DNS_VERSION=v2.7.6
- KNOT_DNS_VERSION=2.7
- MALLOC_CHECK_=3
- MALLOC_PERTURB_=223
before_script:
......@@ -31,8 +30,9 @@ before_script:
- make -j2 install
- cd ..
script:
- meson build_darwin --default-library=static --buildtype=debugoptimized --prefix=${HOME}/.local -Dc_args='-fno-omit-frame-pointer'
- ninja -C build_darwin install
- meson build_darwin --default-library=static --buildtype=debugoptimized --prefix=${HOME}/.local/usr -Dc_args='-fno-omit-frame-pointer'
- ninja -C build_darwin -v install
- meson test -C build_darwin --suite unit
- ${HOME}/.local/usr/sbin/kresd -h
- ${HOME}/.local/usr/sbin/kresd -V
- echo "quit()" | ${HOME}/.local/usr/sbin/kresd -a 127.0.0.1@53535 .
......
......@@ -11,7 +11,7 @@ contrib_src = files([
'base64.c'
])
contrib_inc = include_directories('.')
contrib_inc = include_directories('.', '..')
contrib_lib = static_library(
'contrib',
......
......@@ -44,6 +44,8 @@ systemd_work_dir = ''
run_dir = ''
systemd_unit_dir = ''
systemd_tmpfiles_dir = ''
mod_inc_dir = include_directories('.', 'contrib/',
luajit.get_pkgconfig_variable('includedir'))
## Trust anchors
managed_ta = get_option('managed_ta') == 'enabled'
......
......@@ -8,11 +8,7 @@ c_src_lint += bogus_log_src
bogus_log_mod = shared_module(
'bogus_log',
bogus_log_src,
dependencies: [
contrib_dep,
libkres_dep,
libknot,
],
include_directories: mod_inc_dir,
name_prefix: '',
install: true,
install_dir: modules_dir,
......
......@@ -37,11 +37,10 @@ if libprotobuf_c.found() and libfstrm.found() and protoc_c.found()
dnstap_src,
dnstap_pb[1],
dependencies: [
contrib_dep,
libkres_dep,
libfstrm,
libprotobuf_c,
],
include_directories: mod_inc_dir,
name_prefix: '',
install: true,
install_dir: modules_dir,
......
......@@ -8,11 +8,7 @@ c_src_lint += edns_keepalive_src
edns_keepalive_mod = shared_module(
'edns_keepalive',
edns_keepalive_src,
dependencies: [
contrib_dep,
libkres_dep,
libknot,
],
include_directories: mod_inc_dir,
name_prefix: '',
install: true,
install_dir: modules_dir,
......
......@@ -8,12 +8,7 @@ c_src_lint += hints_src
hints_mod = shared_module(
'hints',
hints_src,
dependencies: [
contrib_dep,
libkres_dep,
libknot,
luajit,
],
include_directories: mod_inc_dir,
name_prefix: '',
install: true,
install_dir: modules_dir,
......
......@@ -8,12 +8,7 @@ c_src_lint += nsid_src
nsid_mod = shared_module(
'nsid',
nsid_src,
dependencies: [
contrib_dep,
libkres_dep,
libknot,
luajit,
],
include_directories: mod_inc_dir,
name_prefix: '',
install: true,
install_dir: modules_dir,
......
......@@ -21,7 +21,7 @@ if lua_ac_submodule.returncode() != 0
error('run "git submodule update --init --recursive" to initialize git submodules')
endif
# compile bundled lua-aho-corasick lib
# compile bundled lua-aho-corasick as shared module
lua_ac_src = files([
'lua-aho-corasick/ac_fast.cxx',
'lua-aho-corasick/ac_lua.cxx',
......@@ -31,12 +31,12 @@ lua_ac_src = files([
lua_ac_lib = shared_module(
'ahocorasick',
lua_ac_src,
dependencies: luajit,
cpp_args: [
'-fvisibility=hidden',
'-Wall',
'-fPIC',
],
include_directories: mod_inc_dir,
name_prefix: '',
install: true,
install_dir: lib_dir,
......
......@@ -13,12 +13,7 @@ integr_tests += [
stats_mod = shared_module(
'stats',
stats_src,
dependencies: [
contrib_dep,
libkres_dep,
libknot,
luajit,
],
include_directories: mod_inc_dir,
name_prefix: '',
install: true,
install_dir: modules_dir,
......
......@@ -9,7 +9,7 @@ mock_cmodule_mod = shared_module(
'mock_cmodule',
mock_cmodule_src,
name_prefix: '',
dependencies: libkres_dep,
include_directories: include_directories('../../'),
)
# executables with tests
......
Markdown is supported
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