upstream: use meson setup <builddir>

Instead of the ambiguous and deprecated `meson <builddir>`.
systemd · Jan 9, 2024 · f8cc3a0 · f8cc3a0
1 parent f853db6
commit f8cc3a0
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/agent/bootstrap-alt.sh b/agent/bootstrap-alt.sh
@@ -219,7 +219,7 @@ fi
     # Make sure we copy over the meson logs even if the compilation fails
     # shellcheck disable=SC2064
     trap "[[ -d $BUILD_DIR/meson-logs ]] && cp -r $BUILD_DIR/meson-logs '$LOGDIR'" EXIT
-    meson "$BUILD_DIR" \
+    meson setup "$BUILD_DIR" \
         -Dc_args='-Og -fno-omit-frame-pointer -ftrapv -shared-libasan -fno-sanitize=function' \
         -Dc_link_args="-shared-libasan -fno-sanitize=function" \
         -Dcpp_args='-Og -fno-omit-frame-pointer -ftrapv -shared-libasan -fno-sanitize=function' \

diff --git a/agent/bootstrap.sh b/agent/bootstrap.sh
@@ -197,7 +197,7 @@ fi
     # Make sure we copy over the meson logs even if the compilation fails
     # shellcheck disable=SC2064
     trap "[[ -d $BUILD_DIR/meson-logs ]] && cp -r $BUILD_DIR/meson-logs '$LOGDIR'" EXIT
-    meson "$BUILD_DIR" \
+    meson setup "$BUILD_DIR" \
         -Dc_args='-fno-omit-frame-pointer -ftrapv -Og' \
         -Dcpp_args='-Og' \
         -Ddebug=true \

diff --git a/vagrant/bootstrap_scripts/arch-coverage.sh b/vagrant/bootstrap_scripts/arch-coverage.sh
@@ -37,7 +37,7 @@ pacman -Q > vagrant-arch-installed-pkgs.txt
 
 rm -fr "$BUILD_DIR"
 # Build phase
-meson "$BUILD_DIR" \
+meson setup "$BUILD_DIR" \
       --werror \
       -Dc_args='-fno-omit-frame-pointer -ftrapv' \
       -Ddebug=true \

diff --git a/vagrant/bootstrap_scripts/arch-sanitizers-clang.sh b/vagrant/bootstrap_scripts/arch-sanitizers-clang.sh
@@ -73,7 +73,7 @@ fi
 #   https://bugzilla.redhat.com/show_bug.cgi?id=1827338#c3
 #   https://github.com/systemd/systemd-centos-ci/issues/247
 
-meson "$BUILD_DIR" \
+meson setup "$BUILD_DIR" \
       --werror \
       -Dc_args='-Og -fno-omit-frame-pointer -ftrapv -shared-libasan' \
       -Dc_link_args="-shared-libasan" \

diff --git a/vagrant/bootstrap_scripts/arch-sanitizers-gcc.sh b/vagrant/bootstrap_scripts/arch-sanitizers-gcc.sh
@@ -51,7 +51,7 @@ rm -fr "$BUILD_DIR"
 #   https://bugzilla.redhat.com/show_bug.cgi?id=1827338#c3
 #   https://github.com/systemd/systemd-centos-ci/issues/247
 
-meson "$BUILD_DIR" \
+meson setup "$BUILD_DIR" \
       --werror \
       -Dc_args='-fno-omit-frame-pointer -ftrapv' \
       -Dcpp_args='-fno-omit-frame-pointer -ftrapv' \

diff --git a/vagrant/bootstrap_scripts/arch.sh b/vagrant/bootstrap_scripts/arch.sh
@@ -38,7 +38,7 @@ pacman -Q > vagrant-arch-installed-pkgs.txt
 rm -fr "$BUILD_DIR"
 # Build phase
 # shellcheck disable=SC2046
-meson "$BUILD_DIR" \
+meson setup "$BUILD_DIR" \
       --werror \
       -Dc_args='-fno-omit-frame-pointer -ftrapv' \
       -Ddebug=true \

diff --git a/vagrant/bootstrap_scripts/rawhide-selinux.sh b/vagrant/bootstrap_scripts/rawhide-selinux.sh
@@ -42,7 +42,7 @@ cat /etc/selinux/config
 
 rm -fr "$BUILD_DIR"
 # Build phase
-meson "$BUILD_DIR" \
+meson setup "$BUILD_DIR" \
       --werror \
       -Dc_args='-fno-omit-frame-pointer -ftrapv' \
       -Ddebug=true \