From f5697b2ca9ed74f04265a4428ee10f7db8e9bf4e Mon Sep 17 00:00:00 2001 From: Tomas Krizek Date: Tue, 26 Feb 2019 14:59:42 +0100 Subject: [PATCH] meson: fix build on OSX --- .travis.yml | 8 ++++---- contrib/meson.build | 2 +- meson.build | 2 ++ modules/bogus_log/meson.build | 6 +----- modules/dnstap/meson.build | 3 +-- modules/edns_keepalive/meson.build | 6 +----- modules/hints/meson.build | 7 +------ modules/nsid/meson.build | 7 +------ modules/policy/meson.build | 4 ++-- modules/stats/meson.build | 7 +------ tests/unit/meson.build | 2 +- 11 files changed, 16 insertions(+), 38 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd4452b7c..9bf6c3e0f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 . diff --git a/contrib/meson.build b/contrib/meson.build index 4c420e07d..e69d01754 100644 --- a/contrib/meson.build +++ b/contrib/meson.build @@ -11,7 +11,7 @@ contrib_src = files([ 'base64.c' ]) -contrib_inc = include_directories('.') +contrib_inc = include_directories('.', '..') contrib_lib = static_library( 'contrib', diff --git a/meson.build b/meson.build index 1b635c971..5d0f31f4e 100644 --- a/meson.build +++ b/meson.build @@ -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' diff --git a/modules/bogus_log/meson.build b/modules/bogus_log/meson.build index 8fc93f365..2c632ee3b 100644 --- a/modules/bogus_log/meson.build +++ b/modules/bogus_log/meson.build @@ -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, diff --git a/modules/dnstap/meson.build b/modules/dnstap/meson.build index ce1fd85a4..af5dd3579 100644 --- a/modules/dnstap/meson.build +++ b/modules/dnstap/meson.build @@ -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, diff --git a/modules/edns_keepalive/meson.build b/modules/edns_keepalive/meson.build index 94ce98ba8..e3e38d353 100644 --- a/modules/edns_keepalive/meson.build +++ b/modules/edns_keepalive/meson.build @@ -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, diff --git a/modules/hints/meson.build b/modules/hints/meson.build index d87587a99..2d3315e0c 100644 --- a/modules/hints/meson.build +++ b/modules/hints/meson.build @@ -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, diff --git a/modules/nsid/meson.build b/modules/nsid/meson.build index 114a8b37f..003d4ee89 100644 --- a/modules/nsid/meson.build +++ b/modules/nsid/meson.build @@ -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, diff --git a/modules/policy/meson.build b/modules/policy/meson.build index 4f324e04e..7e347f13a 100644 --- a/modules/policy/meson.build +++ b/modules/policy/meson.build @@ -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, diff --git a/modules/stats/meson.build b/modules/stats/meson.build index 908638ead..1eefb857f 100644 --- a/modules/stats/meson.build +++ b/modules/stats/meson.build @@ -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, diff --git a/tests/unit/meson.build b/tests/unit/meson.build index db6e87597..130c634d5 100644 --- a/tests/unit/meson.build +++ b/tests/unit/meson.build @@ -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 -- 2.47.3