From 76dd2acc56d52aede51897a2aad0d2cbadddcdf2 Mon Sep 17 00:00:00 2001
From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Thu, 18 Jul 2024 16:42:58 +0200
Subject: [PATCH] rec: avoid duplicate object files in meson build

---
 pdns/recursordist/meson.build          |  4 +---
 pdns/recursordist/settings/meson.build | 10 ++++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pdns/recursordist/meson.build b/pdns/recursordist/meson.build
index 08bcd6498c..634e7c0585 100644
--- a/pdns/recursordist/meson.build
+++ b/pdns/recursordist/meson.build
@@ -251,7 +251,6 @@ dep_htmlfiles = declare_dependency(
 deps = [
   dep_pdns,
   dep_no_config_in_source,
-  dep_settings,
   dep_rust_settings,
   dep_boost,
   dep_boost_context,
@@ -359,6 +358,7 @@ librec_common = declare_dependency(
     config_h,
     dependencies: [
       deps,
+      dep_settings_ch,
       librec_dnslabeltext,
     ],
   )
@@ -492,8 +492,6 @@ if get_option('unit-tests')
   }
 endif
 
-
-
 man_pages = []
 foreach tool, info: tools
   var_name = tool.underscorify()
diff --git a/pdns/recursordist/settings/meson.build b/pdns/recursordist/settings/meson.build
index 8ab353dc62..1ecdf79c0e 100644
--- a/pdns/recursordist/settings/meson.build
+++ b/pdns/recursordist/settings/meson.build
@@ -19,11 +19,17 @@ settings = custom_target(
   output: generated,
 )
 
-dep_settings = declare_dependency(
+# librec_common depends on this, so the sources get linked
+dep_settings_ch = declare_dependency(
   sources: [settings, 'cxxsupport.cc'],
   include_directories: [include_directories('.'), ]
 )
 
-subdir('rust')
+# The rust parts depend on this, no sources listed, which avoid duplicates object files
+# In turn deps (defined in the main meson.build file, includes dep_rust_settings)
+dep_settings = declare_dependency(
+  include_directories: [include_directories('.'), ]
+)
 
+subdir('rust')
 
-- 
2.47.2