From: Otto Moerbeek Date: Mon, 28 Jul 2025 14:47:00 +0000 (+0200) Subject: rec: put lib.rs into tarball X-Git-Tag: auth-5.1.0-alpha0~8^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F15938%2Fhead;p=thirdparty%2Fpdns.git rec: put lib.rs into tarball Plus some rearrangement is more like the dnsdist one Signed-off-by: Otto Moerbeek --- diff --git a/pdns/recursordist/meson-dist-script.sh b/pdns/recursordist/meson-dist-script.sh index da37fd592..890dfe732 100755 --- a/pdns/recursordist/meson-dist-script.sh +++ b/pdns/recursordist/meson-dist-script.sh @@ -22,14 +22,9 @@ tar -C "$MESON_SOURCE_ROOT" -hcf - $symlinks | tar -xf - -C "$MESON_PROJECT_DIST echo Running autoreconf -vi so distfile is still usable for autotools building # Run autoconf for people using autotools to build, this creates a configure sc autoreconf -vi - -# Generate man pages -cd "$MESON_PROJECT_BUILD_ROOT" -ninja pdns_recursor.1 -cp -vp *.1 "$MESON_PROJECT_DIST_ROOT" - rm -rf "$MESON_PROJECT_DIST_ROOT"/autom4te.cache +cd "$MESON_PROJECT_BUILD_ROOT" # Generate a few files to reduce build dependencies echo 'If the below command generates an error, remove dnslabeltext.cc from source dir (remains of an autotools build?) and start again with a clean meson setup' @@ -39,3 +34,10 @@ echo 'If the below command generates an error, remove effective_tld_names.dat an ninja pubsuffix.cc cp -vp pubsuffix.cc "$MESON_PROJECT_DIST_ROOT" +# Generate the sources for our Rust-based library, lib.rs is needed by a pre-configure step on some build systems +meson compile rec-rust-sources +cp -vp "$MESON_SOURCE_ROOT"/rec-rust-lib/rust/src/lib.rs "$MESON_PROJECT_DIST_ROOT"/rec-rust-lib/rust/src/ + +# Generate man pages +meson compile man-pages +cp -vp *.1 "$MESON_PROJECT_DIST_ROOT" diff --git a/pdns/recursordist/rec-rust-lib/meson.build b/pdns/recursordist/rec-rust-lib/meson.build index a38f87c5e..98d812dbc 100644 --- a/pdns/recursordist/rec-rust-lib/meson.build +++ b/pdns/recursordist/rec-rust-lib/meson.build @@ -14,6 +14,7 @@ generated = [ python = find_program('python3') recrust = custom_target( + 'rec-rust-sources', command: [python, '@INPUT0@', '@SOURCE_ROOT@/rec-rust-lib', '@BUILD_ROOT@/rec-rust-lib'], input: sources, output: generated,