meson: fix build on OSX

diff --git a/.travis.yml b/.travis.yml
index cd4452b7cf1ad75b414c0e9b273b0ad2cc4611f0..9bf6c3e0f168e9f604f464e7647cd9cdbb02882d 100644 (file)
--- 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 4c420e07da4a01f84fcdf48d73a0e583de0a6cc7..e69d01754a4eed42ca91c32da7564501f39829f8 100644 (file)
--- 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 1b635c9712f17745314e8d3d5d9962f526abd319..5d0f31f4ee1946f927cc06f4109a075427fc1453 100644 (file)
--- 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 8fc93f3659d1cf95a63388cccdb798c2fe62704e..2c632ee3b9df8334c7de27d11a74c35b1cd44e89 100644 (file)
--- 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 ce1fd85a4a8c7338fce11896dd5fc18d8acf187f..af5dd357997dd582a1022ef61e6c44a0337d4dd9 100644 (file)
--- 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 94ce98ba8f162319bd72a3da33c6a061a430965a..e3e38d353bb08c0fa70a7dafff8f9399d1af052b 100644 (file)
--- 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 d87587a996b6f0825d5a938ac96c193be00b6fed..2d3315e0c4aeb6562114bfb2857553ced44ae8e8 100644 (file)
--- 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 114a8b37f948f8da0f64d1be7dfbdaaac3b34407..003d4ee89b494bc22cf3b2c325ab671ea706d3bb 100644 (file)
--- 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 4f324e04e3dbbb031339eed597b27b07bc874bae..7e347f13a9907a35407668a865d8d3f5e9f72637 100644 (file)
--- 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 908638ead39ecbe3d35947e54cc23ed458dbe1e2..1eefb857f5a1fafd025110d9c3b74b1fa981a908 100644 (file)
--- 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 db6e875977c10bfe44295a52ed528a3bc2a25986..130c634d5879e938bf3e5f8516d1fda95c41bb57 100644 (file)
--- 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