Miroirs/Conty
1
0
Fork 0
mirror of https://github.com/Kron4ek/Conty synced 2024-11-16 19:50:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bump utils versions and fix compilation

Browse source 
Fix compilation of dwarfs and bash.
This commit is contained in:
Kron4ek 2024-08-19 15:43:43 +03:00
parent 8a33737b6e
commit ed430e58f4
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/utils.yml vendored
View file

@ -2,7 +2,7 @@ name: Utils CI
on: on:
schedule: schedule:
- cron: '0 0 * * 1' - cron: '0 0 1 * *'
push: push:
paths: paths:
- 'create-utils.sh' - 'create-utils.sh'
@ -25,7 +25,7 @@ jobs:
zstd libarchive libunwind google-glog gtest fmt gflags \ zstd libarchive libunwind google-glog gtest fmt gflags \
double-conversion cmake ruby-ronn libevent libdwarf git \ double-conversion cmake ruby-ronn libevent libdwarf git \
clang libsodium liburing libaio musl kernel-headers-musl utf8cpp \ 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 build_dwarfs=false ./create-utils.sh
tar xf utils.tar.gz tar xf utils.tar.gz
mv utils utils-bak mv utils utils-bak

12
create-utils.sh
View file

@ -16,13 +16,13 @@ script_dir="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
build_dwarfs="${build_dwarfs:-false}" build_dwarfs="${build_dwarfs:-false}"
squashfuse_version="0.5.2" squashfuse_version="0.5.2"
bwrap_version="0.9.0" bwrap_version="0.10.0"
lz4_version="1.9.4" lz4_version="1.10.0"
zstd_version="1.5.6" zstd_version="1.5.6"
squashfs_tools_version="4.6.1" squashfs_tools_version="4.6.1"
unionfs_fuse_version="3.3" unionfs_fuse_version="3.3"
busybox_version="1.36.1" busybox_version="1.36.1"
bash_version="5.2.21" bash_version="5.2.32"
export CC=clang export CC=clang
export CXX=clang++ export CXX=clang++
@ -87,10 +87,10 @@ make CC=musl-gcc -j"$(nproc)"
cd ../bash-${bash_version} cd ../bash-${bash_version}
curl -#Lo bash.patch "https://raw.githubusercontent.com/robxu9/bash-static/master/custom/bash-musl-strtoimax-debian-1023053.patch" curl -#Lo bash.patch "https://raw.githubusercontent.com/robxu9/bash-static/master/custom/bash-musl-strtoimax-debian-1023053.patch"
patch -Np1 < ./bash.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 autoconf -f
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
CFLAGS="${CFLAGS} -static" CC=musl-gcc make -j"$(nproc)" CFLAGS="${CFLAGS} -Wno-error=implicit-function-declaration -static" CC=musl-gcc make -j"$(nproc)"
if [ "${build_dwarfs}" != "true" ]; then if [ "${build_dwarfs}" != "true" ]; then
cd ../squashfuse-"${squashfuse_version}" || exit 1 cd ../squashfuse-"${squashfuse_version}" || exit 1