Update integrated utils

This commit is contained in:
Kron4ek 2023-07-16 16:33:06 +05:00
parent d0fcf5e714
commit b1c405c46f
4 changed files with 7 additions and 15 deletions

View file

@ -30,7 +30,7 @@ init_size=50000
bash_size=1490760 bash_size=1490760
script_size=37193 script_size=37193
busybox_size=1161112 busybox_size=1161112
utils_size=4321630 utils_size=4327795
# Full path to the script # Full path to the script
if [ -n "${BASH_SOURCE[0]}" ]; then if [ -n "${BASH_SOURCE[0]}" ]; then

View file

@ -6,7 +6,7 @@
# #
# Dwarfs build dependencies: fuse2 (or fuse3) openssl jemalloc # Dwarfs build dependencies: fuse2 (or fuse3) openssl jemalloc
# xxhash boost lz4 xz zstd libarchive libunwind google-glod gtest fmt # xxhash boost lz4 xz zstd libarchive libunwind google-glod gtest fmt
# gflags double-conversion cmake ruby-ronn libevent libdwarf git # gflags double-conversion cmake ruby-ronn libevent libdwarf git utf8cpp
# #
# Dwarfs compilation is optional and disabled by default. # Dwarfs compilation is optional and disabled by default.
@ -15,7 +15,7 @@ script_dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
# Set to true to compile dwarfs instead of squashfuse # Set to true to compile dwarfs instead of squashfuse
build_dwarfs="${build_dwarfs:-false}" build_dwarfs="${build_dwarfs:-false}"
squashfuse_version="0.1.105" squashfuse_version="0.2.0"
bwrap_version="0.8.0" bwrap_version="0.8.0"
lz4_version="1.9.4" lz4_version="1.9.4"
zstd_version="1.5.5" zstd_version="1.5.5"
@ -136,15 +136,7 @@ if [ "${build_dwarfs}" = "true" ]; then
git clone https://github.com/mhx/dwarfs.git --recursive git clone https://github.com/mhx/dwarfs.git --recursive
# Revert commit aeeddae, because otherwise dwarfs might use
# /usr/lib/locale/locale-archive file, which would break it
# on systems using musl libc
#
# This can also be worked around by setting LC_ALL=C, but for now
# let's revert the commit
cd dwarfs || exit 1 cd dwarfs || exit 1
git revert --no-commit aeeddaecab5d4648780b0e11dc03fca19e23409a
mkdir build mkdir build
cd build || exit 1 cd build || exit 1
cmake .. -DCMAKE_BUILD_TYPE=Release \ cmake .. -DCMAKE_BUILD_TYPE=Release \

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:23d1e5f1ab90362435c26376f7072ccd9734c0169e5de78799ea9c9170cd277e oid sha256:e7b623d090dda275c91cf1bd9711324c279114825b9b993614316349349856c4
size 4321630 size 4327795

View file

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:4f77f6e120728642b503b185d1cefa7b8ff1126f578486f991f52fe66f37c255 oid sha256:f872cf7fe51c233b566ffa9535f02db50c6a5677cfcebd8c793a17289a9881c4
size 11628797 size 11808152