fix meson setup

diff --git a/.github/workflows/build-and-test-all.yml b/.github/workflows/build-and-test-all.yml
index 8820041ec431868b0ae7b2a884d8e0680d48e1da..9adc27573f6cf11383079a432271fdf3141ec946 100644 (file)
--- a/.github/workflows/build-and-test-all.yml
+++ b/.github/workflows/build-and-test-all.yml
@@ -174,8 +174,8 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.ccache
-          key: recursor-${{ matrix.features }}-${{ matrix.sanitizers }}-ccache-${{ steps.get-stamp.outputs.stamp }}
-          restore-keys: recursor-${{ matrix.features }}-${{ matrix.sanitizers }}-ccache-
+          key: recursor-ccache-${{ matrix.builder }}-${{ matrix.features }}-${{ matrix.sanitizers }}-${{ steps.get-stamp.outputs.stamp }}
+          restore-keys: recursor-ccache-${{ matrix.builder }}-${{ matrix.features }}-${{ matrix.sanitizers }}
       - run: inv install-rec-build-deps ${{ matrix.builder == 'meson' && '--meson' || '' }}
         working-directory: ./pdns/recursordist/
       - run: inv ci-install-rust ${{ env.REPO_HOME }}

diff --git a/tasks.py b/tasks.py
index 35417ccc2af4d339540395f7598c4d85b4841b82..b2423e39a180863183ca9a5c0694232b50ec820b 100644 (file)
--- a/tasks.py
+++ b/tasks.py
@@ -452,12 +452,14 @@ def get_base_configure_cmd(additional_c_flags='', additional_cxx_flags='', enabl
 def get_base_configure_cmd_meson(build_dir, additional_c_flags='', additional_cxx_flags='', enable_systemd=True, enable_sodium=True):
     cflags = " ".join([get_cflags(), additional_c_flags])
     cxxflags = " ".join([get_cxxflags(), additional_cxx_flags])
-    return " ".join([
+    env = " ".join([
         f'CFLAGS="{cflags}"',
         f'CXXFLAGS="{cxxflags}"',
         f"CC='{get_c_compiler()}'",
-        f"CXX='{get_cxx_compiler()}'",
-        f'. {repo_home}/.venv/bin/activate && meson setup {build_dir}',
+        f"CXX='{get_cxx_compiler()}'"
+    ])
+    return " ".join([
+        f'. {repo_home}/.venv/bin/activate && {env} meson setup {build_dir}',
         "-D systemd={}".format("enabled" if enable_systemd else "disabled"),
         "-D signers-libsodium={}".format("enabled" if enable_sodium else "disabled"),
         "-D hardening-fortify-source=auto",