Merge branch 'minizip' into 'master'

nix: Fix gcc13-freestanding-install again

See merge request redox-os/redox!2311
This commit is contained in:
Jeremy Soller 2026-08-28 14:03:05 -06:00
commit 7f126a559e

View File

@ -4,15 +4,15 @@ branch = "redox-13.2.0"
shallow_clone = true
script = """
DYNAMIC_INIT
LIBTOOL_BUILD_AUX="${COOKBOOK_LIBTOOL_DIR:-$COOKBOOK_HOST_SYSROOT}"/share/libtool/build-aux
cp -fpv "$LIBTOOL_BUILD_AUX"/{config.sub,config.guess,install-sh} libiberty/
cp -fpv "$LIBTOOL_BUILD_AUX"/{compile,config.sub,config.guess,depcomp,install-sh,ltmain.sh,missing} zlib/contrib/minizip/
export COOKBOOK_AUTORECONF=$(
command -v autoreconf2.69 2>/dev/null || \\
(autoreconf --version 2>/dev/null | grep -q '2\\.69' && command -v autoreconf) || \\
(echo "Error: Autoconf 2.69 required" >&2; exit 1)
)
autotools_recursive_regenerate -I"$(realpath ./config)"
LIBTOOL_BUILD_AUX="${COOKBOOK_LIBTOOL_DIR:-$COOKBOOK_HOST_SYSROOT}"/share/libtool/build-aux
cp -fpv "$LIBTOOL_BUILD_AUX"/{config.sub,config.guess,install-sh} libiberty/
cp -fpv "$LIBTOOL_BUILD_AUX"/{config.sub,config.guess,install-sh} zlib/contrib/minizip/
"""
[build]