From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 15 Jan 2025 14:57:48 +0000 (+0000)
Subject: zlib-ng: Don't install the static version of the library
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e21f69e81fb0b681478713583a07c898be2a585;p=people%2Fstevee%2Fipfire-2.x.git

zlib-ng: Don't install the static version of the library

We want everythink to link against zlib dynamically so that we can
easily replace the library in case there is some urgent reason to do so.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
---

diff --git a/config/rootfiles/common/zlib-ng b/config/rootfiles/common/zlib-ng
index be111d244..4f5e65293 100644
--- a/config/rootfiles/common/zlib-ng
+++ b/config/rootfiles/common/zlib-ng
@@ -7,11 +7,9 @@ lib/libz.so.1.3.1.zlib-ng
 #usr/include/zlib.h
 #usr/include/zlib_name_mangling-ng.h
 #usr/include/zlib_name_mangling.h
-#usr/lib/libz-ng.a
 #usr/lib/libz-ng.so
 usr/lib/libz-ng.so.2
 usr/lib/libz-ng.so.2.2.3
-#usr/lib/libz.a
 #usr/lib/pkgconfig
 #usr/lib/pkgconfig/zlib-ng.pc
 #usr/lib/pkgconfig/zlib.pc
diff --git a/lfs/zlib-ng b/lfs/zlib-ng
index 7708d3c76..5c2c5a30e 100644
--- a/lfs/zlib-ng
+++ b/lfs/zlib-ng
@@ -94,6 +94,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP)/build  && make install
 	cd $(DIR_APP)/compat && make install
 
+	# Remove the static versions
+	rm -vf /usr/lib/libz.a /usr/lib/libz-ng.a
+
 ifneq "$(TOOLCHAIN)" "1"
 	mv -v /usr/lib/libz.so.1.3.1.zlib-ng /lib/libz.so.1.3.1.zlib-ng
 	ln -svf libz.so.1.3.1.zlib-ng /lib/libz.so.1