From f84b099445164b23df9719fa0977a64635280aed Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Fri, 24 Jan 2025 14:57:12 +0100 Subject: [PATCH] rec: fix two issues building rec using meson on debian11 1. Local arc4random was not declared as dependency 2. libresolv was not found (no pkgconfig file) but is still needed --- meson/libresolv/meson.build | 8 ++++++++ pdns/recursordist/meson.build | 1 + 2 files changed, 9 insertions(+) diff --git a/meson/libresolv/meson.build b/meson/libresolv/meson.build index ca1bfc3483..0f4d43e6c7 100644 --- a/meson/libresolv/meson.build +++ b/meson/libresolv/meson.build @@ -6,6 +6,14 @@ if not dep_libresolv.found() if build_machine.system() == 'darwin' add_project_link_arguments('-lresolv', language: 'cpp') need = true + else + lib_resolv = cxx.find_library('libresolv', disabler: true, required: false) + if lib_resolv.found() + if cxx.links(prog, name: '-lresolv is needed', dependencies: lib_resolv) + need = true + dep_libresolv = declare_dependency(dependencies: lib_resolv) + endif + endif endif else need = true diff --git a/pdns/recursordist/meson.build b/pdns/recursordist/meson.build index 1cc057e836..2726012ad6 100644 --- a/pdns/recursordist/meson.build +++ b/pdns/recursordist/meson.build @@ -297,6 +297,7 @@ deps = [ dep_boost, dep_boost_context, dep_threads, + dep_arc4random, dep_json11, dep_libcrypto, dep_libresolv, -- 2.47.2