From 786844a255e940502d71788b3fed30b765383548 Mon Sep 17 00:00:00 2001
From: vxtls <187420201+vxtls@users.noreply.github.com>
Date: Fri, 6 Mar 2026 13:04:18 -0500
Subject: [PATCH] fix(zlib): build shared and static libraries for guile-zlib

---
 steps-guix/guile-avahi-0.4.1/pass1.sh   | 3 ---
 steps-guix/guile-gcrypt-0.5.0/pass1.sh  | 3 ---
 steps-guix/guile-git-0.10.0/pass1.sh    | 1 -
 steps-guix/guile-json-4.7.3/pass1.sh    | 3 ---
 steps-guix/guile-lzlib-0.0.2/pass1.sh   | 3 ---
 steps-guix/guile-sqlite3-0.1.3/pass1.sh | 3 ---
 steps-guix/guile-zlib-0.2.2/pass1.sh    | 3 ---
 steps/zlib-1.3.1/pass1.sh               | 2 +-
 8 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/steps-guix/guile-avahi-0.4.1/pass1.sh b/steps-guix/guile-avahi-0.4.1/pass1.sh
index 580ea505..46dfded3 100755
--- a/steps-guix/guile-avahi-0.4.1/pass1.sh
+++ b/steps-guix/guile-avahi-0.4.1/pass1.sh
@@ -16,9 +16,6 @@ src_configure() {
     ./configure \
         --prefix="${PREFIX}" \
         --libdir="${LIBDIR}" \
-        '--with-guile-site-dir=$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)' \
-        '--with-guile-site-ccache-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache' \
-        '--with-guile-extension-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions' \
         --host="${host_triplet}" \
         --build="${host_triplet}"
 }
diff --git a/steps-guix/guile-gcrypt-0.5.0/pass1.sh b/steps-guix/guile-gcrypt-0.5.0/pass1.sh
index 71558dce..6bddd648 100644
--- a/steps-guix/guile-gcrypt-0.5.0/pass1.sh
+++ b/steps-guix/guile-gcrypt-0.5.0/pass1.sh
@@ -21,9 +21,6 @@ src_configure() {
     ../configure \
         --prefix="${PREFIX}" \
         --libdir="${LIBDIR}" \
-        '--with-guile-site-dir=$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)' \
-        '--with-guile-site-ccache-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache' \
-        '--with-guile-extension-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions' \
         --host="${host_triplet}" \
         --build="${host_triplet}" \
         --with-libgcrypt-prefix="${PREFIX}" \
diff --git a/steps-guix/guile-git-0.10.0/pass1.sh b/steps-guix/guile-git-0.10.0/pass1.sh
index b57248eb..02590664 100755
--- a/steps-guix/guile-git-0.10.0/pass1.sh
+++ b/steps-guix/guile-git-0.10.0/pass1.sh
@@ -29,7 +29,6 @@ src_configure() {
         --prefix="${PREFIX}" \
         --libdir="${LIBDIR}" \
         '--with-guile-site-dir=$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)' \
-        '--with-guile-site-ccache-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache' \
         '--with-guile-extension-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions' \
         --host="${host_triplet}" \
         --build="${host_triplet}"
diff --git a/steps-guix/guile-json-4.7.3/pass1.sh b/steps-guix/guile-json-4.7.3/pass1.sh
index 4951408c..ace38a62 100755
--- a/steps-guix/guile-json-4.7.3/pass1.sh
+++ b/steps-guix/guile-json-4.7.3/pass1.sh
@@ -17,9 +17,6 @@ src_configure() {
     ./configure \
         --prefix="${PREFIX}" \
         --libdir="${LIBDIR}" \
-        '--with-guile-site-dir=$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)' \
-        '--with-guile-site-ccache-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache' \
-        '--with-guile-extension-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions' \
         --host="${host_triplet}" \
         --build="${host_triplet}"
 }
diff --git a/steps-guix/guile-lzlib-0.0.2/pass1.sh b/steps-guix/guile-lzlib-0.0.2/pass1.sh
index 1e47b641..0215e50f 100755
--- a/steps-guix/guile-lzlib-0.0.2/pass1.sh
+++ b/steps-guix/guile-lzlib-0.0.2/pass1.sh
@@ -17,9 +17,6 @@ src_configure() {
     ./configure \
         --prefix="${PREFIX}" \
         --libdir="${LIBDIR}" \
-        '--with-guile-site-dir=$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)' \
-        '--with-guile-site-ccache-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache' \
-        '--with-guile-extension-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions' \
         --host="${host_triplet}" \
         --build="${host_triplet}"
 }
diff --git a/steps-guix/guile-sqlite3-0.1.3/pass1.sh b/steps-guix/guile-sqlite3-0.1.3/pass1.sh
index 30af276b..2b1c0537 100755
--- a/steps-guix/guile-sqlite3-0.1.3/pass1.sh
+++ b/steps-guix/guile-sqlite3-0.1.3/pass1.sh
@@ -17,9 +17,6 @@ src_configure() {
     ./configure \
         --prefix="${PREFIX}" \
         --libdir="${LIBDIR}" \
-        '--with-guile-site-dir=$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)' \
-        '--with-guile-site-ccache-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache' \
-        '--with-guile-extension-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions' \
         --host="${host_triplet}" \
         --build="${host_triplet}"
 }
diff --git a/steps-guix/guile-zlib-0.2.2/pass1.sh b/steps-guix/guile-zlib-0.2.2/pass1.sh
index 1e47b641..0215e50f 100755
--- a/steps-guix/guile-zlib-0.2.2/pass1.sh
+++ b/steps-guix/guile-zlib-0.2.2/pass1.sh
@@ -17,9 +17,6 @@ src_configure() {
     ./configure \
         --prefix="${PREFIX}" \
         --libdir="${LIBDIR}" \
-        '--with-guile-site-dir=$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)' \
-        '--with-guile-site-ccache-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache' \
-        '--with-guile-extension-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions' \
         --host="${host_triplet}" \
         --build="${host_triplet}"
 }
diff --git a/steps/zlib-1.3.1/pass1.sh b/steps/zlib-1.3.1/pass1.sh
index 36c86a5e..a4bae265 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}" --static
+    ./configure --prefix="${PREFIX}" --libdir="${LIBDIR}" --shared
 }