From 5d1289345b26f30d9992ac6ec93f2c31efec9e58 Mon Sep 17 00:00:00 2001 From: vxtls <187420201+vxtls@users.noreply.github.com> Date: Fri, 6 Mar 2026 22:04:38 -0500 Subject: [PATCH] fix(zlib): keep bootstrap static and build shared zlib in steps-guix --- steps-guix/manifest | 1 + steps-guix/zlib-1.3.1/pass1.sh | 31 +++++++++++++++++++++++++++++++ steps-guix/zlib-1.3.1/sources | 1 + steps/zlib-1.3.1/pass1.sh | 2 +- 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100755 steps-guix/zlib-1.3.1/pass1.sh create mode 100644 steps-guix/zlib-1.3.1/sources diff --git a/steps-guix/manifest b/steps-guix/manifest index 77bf84b8..1791c20c 100644 --- a/steps-guix/manifest +++ b/steps-guix/manifest @@ -28,6 +28,7 @@ build: gnutls-3.8.12 build: guile-gnutls-v5.0.1 build: unzip-6.0 build: sqlite-3510200 +build: zlib-1.3.1 build: guile-sqlite3-0.1.3 build: guile-zlib-0.2.2 build: guile-lzlib-0.0.2 diff --git a/steps-guix/zlib-1.3.1/pass1.sh b/steps-guix/zlib-1.3.1/pass1.sh new file mode 100755 index 00000000..a4bae265 --- /dev/null +++ b/steps-guix/zlib-1.3.1/pass1.sh @@ -0,0 +1,31 @@ +# SPDX-FileCopyrightText: 2021 Andrius Štikonas +# +# SPDX-License-Identifier: GPL-3.0-or-later + +src_prepare() { + default + + rm zlib.3.pdf \ + doc/crc-doc.1.0.pdf \ + contrib/puff/zeros.raw \ + contrib/blast/test.pk \ + contrib/dotzlib/DotZLib.chm + + rm crc32.h + gcc -DMAKECRCH crc32.c -o gen_crc32h + ./gen_crc32h + + echo "void makefixed(void); int main() { makefixed(); }" > makefixed_main.c + gcc -DMAKEFIXED inflate.c crc32.c zutil.c inftrees.c \ + adler32.c inffast.c makefixed_main.c -o gen_inffixedh + ./gen_inffixedh > inffixed.h + + echo "void makefixed9(void); int main() { makefixed9(); }" > makefixed9_main.c + gcc -DMAKEFIXED -I. contrib/infback9/infback9.c zutil.c \ + contrib/infback9/inftree9.c makefixed9_main.c -o gen_inffix9h + ./gen_inffix9h > contrib/infback9/inffix9.h +} + +src_configure() { + ./configure --prefix="${PREFIX}" --libdir="${LIBDIR}" --shared +} diff --git a/steps-guix/zlib-1.3.1/sources b/steps-guix/zlib-1.3.1/sources new file mode 100644 index 00000000..2227009a --- /dev/null +++ b/steps-guix/zlib-1.3.1/sources @@ -0,0 +1 @@ +f https://zlib.net/fossils/zlib-1.3.1.tar.gz 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23 diff --git a/steps/zlib-1.3.1/pass1.sh b/steps/zlib-1.3.1/pass1.sh index a4bae265..36c86a5e 100755 --- a/steps/zlib-1.3.1/pass1.sh +++ b/steps/zlib-1.3.1/pass1.sh @@ -27,5 +27,5 @@ src_prepare() { } src_configure() { - ./configure --prefix="${PREFIX}" --libdir="${LIBDIR}" --shared + ./configure --prefix="${PREFIX}" --libdir="${LIBDIR}" --static }