Update integrated utils

Kron4ek · Nov 22, 2024 · 861fce5 · 861fce5
1 parent 121f35e
commit 861fce5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/.github/workflows/utils.yml b/.github/workflows/utils.yml
@@ -25,7 +25,7 @@ jobs:
                  zstd libarchive libunwind google-glog gtest fmt gflags \
                  double-conversion cmake ruby-ronn libevent libdwarf git \
                  clang libsodium liburing libaio musl kernel-headers-musl utf8cpp \
-                 chrono-date python python-mistletoe range-v3 nlohmann-json
+                 chrono-date python python-mistletoe range-v3 nlohmann-json meson
           build_dwarfs=false ./create-utils.sh
           tar xf utils.tar.gz
           mv utils utils-bak

diff --git a/create-utils.sh b/create-utils.sh
@@ -58,9 +58,8 @@ if [ "${build_dwarfs}" != "true" ]; then
 fi
 
 cd bubblewrap-"${bwrap_version}" || exit 1
-./autogen.sh
-./configure --disable-selinux --disable-man
-make -j"$(nproc)" DESTDIR="${script_dir}"/build-utils/bin install
+meson -Dselinux=disabled -Dman=disabled build
+DESTDIR="${script_dir}"/build-utils/bin meson install -C build
 
 cd ../unionfs-fuse-"${unionfs_fuse_version}" || exit 1
 mkdir build-fuse3

diff --git a/utils.tar.gz b/utils.tar.gz
diff --git a/utils_dwarfs.tar.gz b/utils_dwarfs.tar.gz