Bump utils versions and fix compilation

Fix compilation of dwarfs and bash.
Kron4ek · Aug 19, 2024 · ed430e5 · ed430e5
1 parent 8a33737
commit ed430e5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/utils.yml b/.github/workflows/utils.yml
@@ -2,7 +2,7 @@ name: Utils CI
 
 on:
   schedule:
-    - cron:  '0 0 * * 1'
+    - cron:  '0 0 1 * *'
   push:
     paths:
       - 'create-utils.sh'
@@ -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
+                 chrono-date python python-mistletoe range-v3 nlohmann-json
           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
@@ -16,13 +16,13 @@ script_dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
 build_dwarfs="${build_dwarfs:-false}"
 
 squashfuse_version="0.5.2"
-bwrap_version="0.9.0"
-lz4_version="1.9.4"
+bwrap_version="0.10.0"
+lz4_version="1.10.0"
 zstd_version="1.5.6"
 squashfs_tools_version="4.6.1"
 unionfs_fuse_version="3.3"
 busybox_version="1.36.1"
-bash_version="5.2.21"
+bash_version="5.2.32"
 
 export CC=clang
 export CXX=clang++
@@ -87,10 +87,10 @@ make CC=musl-gcc -j"$(nproc)"
 cd ../bash-${bash_version}
 curl -#Lo bash.patch "https://raw.githubusercontent.com/robxu9/bash-static/master/custom/bash-musl-strtoimax-debian-1023053.patch"
 patch -Np1 < ./bash.patch
-CFLAGS="${CFLAGS} -static" CC=musl-gcc ./configure --without-bash-malloc
+CFLAGS="${CFLAGS} -Wno-error=implicit-function-declaration -static" CC=musl-gcc ./configure --without-bash-malloc
 autoconf -f
-CFLAGS="${CFLAGS} -static" CC=musl-gcc ./configure --without-bash-malloc
-CFLAGS="${CFLAGS} -static" CC=musl-gcc make -j"$(nproc)"
+CFLAGS="${CFLAGS} -Wno-error=implicit-function-declaration -static" CC=musl-gcc ./configure --without-bash-malloc
+CFLAGS="${CFLAGS} -Wno-error=implicit-function-declaration -static" CC=musl-gcc make -j"$(nproc)"
 
 if [ "${build_dwarfs}" != "true" ]; then
 	cd ../squashfuse-"${squashfuse_version}" || exit 1