From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Wed, 2 Jul 2025 07:48:13 +0000 (+0200)
Subject: rec: only include generated pubsuffix.cc in dist file
X-Git-Tag: rec-5.3.0-alpha2~11^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4fdc397f98e12131890a0c15e56dd517b63ed92f;p=thirdparty%2Fpdns.git

rec: only include generated pubsuffix.cc in dist file

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>
---

diff --git a/pdns/recursordist/meson-dist-script.sh b/pdns/recursordist/meson-dist-script.sh
index ebb338d916..da37fd5922 100755
--- a/pdns/recursordist/meson-dist-script.sh
+++ b/pdns/recursordist/meson-dist-script.sh
@@ -36,6 +36,6 @@ echo 'If the below command generates an error, remove dnslabeltext.cc from sourc
 ninja librec-dnslabeltext.a.p/dnslabeltext.cc
 cp -vp librec-dnslabeltext.a.p/dnslabeltext.cc "$MESON_PROJECT_DIST_ROOT"
 echo 'If the below command generates an error, remove effective_tld_names.dat and pubsuffix.cc from source dir (remains of an autotools build?) and start again with a clean meson setup'
-ninja effective_tld_names.dat
-cp -vp effective_tld_names.dat "$MESON_PROJECT_DIST_ROOT"
+ninja pubsuffix.cc
+cp -vp pubsuffix.cc "$MESON_PROJECT_DIST_ROOT"
 
diff --git a/pdns/recursordist/meson.build b/pdns/recursordist/meson.build
index 65338ee32f..1b79818b37 100644
--- a/pdns/recursordist/meson.build
+++ b/pdns/recursordist/meson.build
@@ -357,14 +357,12 @@ librec_signers_openssl = declare_dependency(
 pubsuffix_dl_source =  'effective_tld_names.dat'
 pubsuffix_cc = src_dir / 'pubsuffix.cc'
 if not fs.is_file(pubsuffix_cc)
-  if not fs.is_file(pubsuffix_dl_source)
-    curl_command = find_program('curl', required: true)
-    pubsuffix_dl_source = custom_target(
-      'pubsuffix-dl',
-      command: [curl_command, '-s', '-S', '-o', '@OUTPUT@', 'https://publicsuffix.org/list/public_suffix_list.dat'],
-      output: pubsuffix_dl_source
-    )
-  endif
+  curl_command = find_program('curl', required: true)
+  pubsuffix_dl_source = custom_target(
+    'pubsuffix-dl',
+    command: [curl_command, '-s', '-S', '-o', '@OUTPUT@', 'https://publicsuffix.org/list/public_suffix_list.dat'],
+    output: pubsuffix_dl_source
+  )
 
   mkpubsuffix_command = find_program('mkpubsuffixcc', required: true)
   pubsuffix_cc = custom_target(