Skip to content

Commit

Permalink
Merge pull request #14370 from fredmorcos/fix-lmdb-backend-symbols
Browse files Browse the repository at this point in the history
Fix the LMDB backend not finding symbols in `pdns-auth` and `pdns-auth-util`
  • Loading branch information
fredmorcos authored Jun 26, 2024
2 parents 3a7d243 + 4577e30 commit ebcd727
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
13 changes: 11 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -983,6 +991,7 @@ foreach tool, info: tools
dependencies: [
deps,
libpdns_common,
libpdns_uuidutils,
deps_extra,
],
)
Expand Down
2 changes: 1 addition & 1 deletion modules/lmdbbackend/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ module_extras = files(
'lmdbbackend.hh',
)

module_deps = [deps, dep_lmdb_safe, dep_lmdb, dep_boost_serialization]
module_deps = [deps, dep_lmdb_safe, dep_lmdb, dep_boost_serialization, dep_systemd]

0 comments on commit ebcd727

Please sign in to comment.