From 324b77b6cebf582d3cd554603cdd45f1a7bb0450 Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Thu, 4 Apr 2024 16:04:07 +0200 Subject: [PATCH] Meson: Fix lmdb-safe needs gettime --- ext/lmdb-safe/meson.build | 7 ++++++- meson.build | 19 ++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/ext/lmdb-safe/meson.build b/ext/lmdb-safe/meson.build index d65a9627db..54e09fb69d 100644 --- a/ext/lmdb-safe/meson.build +++ b/ext/lmdb-safe/meson.build @@ -6,7 +6,12 @@ lib_lmdb_safe = static_library( 'lmdb-safe.hh', 'lmdb-typed.hh', ], - dependencies: [dep_pdns, dep_lmdb, dep_boost_serialization], + dependencies: [ + dep_pdns, + dep_lmdb, + dep_boost_serialization, + libpdns_gettime, + ], ) dep_lmdb_safe = declare_dependency( diff --git a/meson.build b/meson.build index f617821c5d..b7f48622a4 100644 --- a/meson.build +++ b/meson.build @@ -95,6 +95,16 @@ subdir('ext' / 'json11') subdir('ext' / 'luawrapper') subdir('ext' / 'protozero') subdir('ext' / 'yahttp') + +libpdns_gettime = declare_dependency( + link_whole: static_library( + 'pdns-gettime', + src_dir / 'gettime.cc', + src_dir / 'gettime.hh', + dependencies: dep_rt, + ) +) + if get_option('module-lmdb') != 'disabled' subdir('ext' / 'lmdb-safe') endif @@ -323,15 +333,6 @@ if dep_sqlite3.found() ) endif -libpdns_gettime = declare_dependency( - link_whole: static_library( - 'pdns-gettime', - src_dir / 'gettime.cc', - src_dir / 'gettime.hh', - dependencies: dep_rt, - ) -) - libpdns_signers_openssl = declare_dependency( link_whole: static_library( 'pdns-signers-openssl', -- 2.47.2