From 4577e307a1e192066904f9c133a68e9bd82a1ea9 Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Sun, 23 Jun 2024 20:46:01 +0200 Subject: [PATCH] Auth/meson: Fix LMDB backend not finding symbols in `pdns-auth-util` This also makes `uuid-utils.{cc,hh}` a separate `link_whole` library to allow keeping its symbols from being stripped at link time. --- meson.build | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 9a5617ffb9..504de53fac 100644 --- a/meson.build +++ b/meson.build @@ -106,6 +106,15 @@ libpdns_gettime = declare_dependency( ) ) +libpdns_uuidutils = declare_dependency( + link_whole: static_library( + 'pdns-uuidutils', + src_dir / 'uuid-utils.cc', + src_dir / 'uuid-utils.hh', + dependencies: dep_rt, + ) +) + if get_option('module-lmdb') != 'disabled' subdir('ext' / 'lmdb-safe') endif @@ -623,8 +632,6 @@ common_sources += files( src_dir / 'unix_semaphore.cc', src_dir / 'unix_utility.cc', src_dir / 'utility.hh', - src_dir / 'uuid-utils.cc', - src_dir / 'uuid-utils.hh', src_dir / 'validate.hh', src_dir / 'version.cc', src_dir / 'version.hh', @@ -690,6 +697,7 @@ tools = { }, 'pdns-auth-util': { 'main': src_dir / 'pdnsutil.cc', + 'export-dynamic': true, 'files-extra': libpdns_bind_dnssec_schema_gen, 'deps-extra': [ dep_modules, @@ -983,6 +991,7 @@ foreach tool, info: tools dependencies: [ deps, libpdns_common, + libpdns_uuidutils, deps_extra, ], ) -- 2.47.2