packaging: Build criterion using meson and ninja

Author: pjungkamp

packaging/deps.sh

@@ -106,10 +106,10 @@ if ! pkg-config "criterion >= 2.4.0" && \
    [ "${ARCH}" == "x86_64" ] && \
    should_build "criterion" "for unit tests"; then
     git clone ${GIT_OPTS} --branch v2.4.2 --recursive https://github.com/Snaipe/Criterion.git
-    mkdir -p Criterion/build
-    pushd Criterion/build
-    cmake ${CMAKE_OPTS} ..
-    make ${MAKE_OPTS} install
+    pushd Criterion
+    meson setup build
+    meson compile -C build
+    meson install -C build
     popd
 fi
 

packaging/docker/Dockerfile.debian

@@ -18,7 +18,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
 	apt-get install -y \
 	gcc g++ \
-	pkg-config cmake make \
+	pkg-config cmake make meson ninja \
 	autoconf automake autogen libtool \
 	texinfo git git-svn curl tar wget diffutils \
 	flex bison \

packaging/docker/Dockerfile.fedora

@@ -15,7 +15,7 @@ ARG DISTRO
 # Toolchain
 RUN dnf -y install \
 	gcc-14 g++-14 \
-	pkgconfig cmake make \
+	pkgconfig cmake make meson ninja \
 	autoconf automake autogen libtool \
 	texinfo git awk git-svn curl tar patchutils \
 	flex bison \

packaging/docker/Dockerfile.rocky

@@ -20,7 +20,7 @@ RUN dnf config-manager --set-enabled crb
 # Toolchain
 RUN dnf --allowerasing -y install \
 	gcc gcc-c++ \
-	pkgconfig cmake make \
+	pkgconfig cmake make meson ninja \
 	autoconf automake libtool \
 	flex bison \
 	texinfo git git-svn curl tar patchutils \

packaging/docker/Dockerfile.ubuntu

@@ -19,7 +19,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get update && \
 	apt-get install -y \
 	gcc g++ \
-	pkg-config cmake make \
+	pkg-config cmake make meson ninja\
 	autoconf automake autogen libtool \
 	texinfo git git-svn curl tar wget diffutils \
 	flex bison \