From 81a00287c836b127d7675690b4b15fc95f08765c Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Mon, 19 May 2025 12:46:47 +0200 Subject: [PATCH] dnsdist: Properly handle autotools-based builds as well --- pdns/dnsdistdist/dnsdist-rust-lib/Makefile.am | 2 +- .../dnsdistdist/dnsdist-rust-lib/dnsdist-settings-generator.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pdns/dnsdistdist/dnsdist-rust-lib/Makefile.am b/pdns/dnsdistdist/dnsdist-rust-lib/Makefile.am index 98fbf5d794..ef9363596a 100644 --- a/pdns/dnsdistdist/dnsdist-rust-lib/Makefile.am +++ b/pdns/dnsdistdist/dnsdist-rust-lib/Makefile.am @@ -17,5 +17,5 @@ rust/src/lib.rs dnsdist-configuration-yaml-items-generated.cc: dnsdist-settings- @if test "$(PYTHON)" = ":"; then echo "Settings definitions have changed, python is needed to regenerate the related settings files but python was not found. Please install python and re-run configure"; exit 1; fi @if ! $(PYTHON) --version | grep -q "Python 3"; then echo $(PYTHON) should be at least version 3. Please install python 3 and re-run configure; exit 1; fi $(MAKE) -C rust clean - (cd ${srcdir} && $(PYTHON) dnsdist-settings-generator.py ../ ./ ../) + (cd ${srcdir} && $(PYTHON) dnsdist-settings-generator.py ../ ./ ../ ../) $(PYTHON) dnsdist-settings-documentation-generator.py diff --git a/pdns/dnsdistdist/dnsdist-rust-lib/dnsdist-settings-generator.py b/pdns/dnsdistdist/dnsdist-rust-lib/dnsdist-settings-generator.py index 9f76fdbe0f..7a102cb11b 100644 --- a/pdns/dnsdistdist/dnsdist-rust-lib/dnsdist-settings-generator.py +++ b/pdns/dnsdistdist/dnsdist-rust-lib/dnsdist-settings-generator.py @@ -377,7 +377,8 @@ void convertRuntimeFlatSettingsFromRust(const dnsdist::rust::settings::GlobalCon ''') os.rename(cxx_flat_settings_fp.name, out_file_path + '/dnsdist-configuration-yaml-items-generated.cc') - os.symlink(os.path.abspath(out_file_path + '/dnsdist-configuration-yaml-items-generated.cc'), build_dir_path + '/dnsdist-configuration-yaml-items-generated.cc') + if out_file_path != build_dir_path: + os.symlink(os.path.abspath(out_file_path + '/dnsdist-configuration-yaml-items-generated.cc'), build_dir_path + '/dnsdist-configuration-yaml-items-generated.cc') def generate_actions_config(output, def_dir, response, default_functions): suffix = 'ResponseAction' if response else 'Action' -- 2.47.2