toolchain: Add zlib

ccache needs this and usually comes with an own bundled
version but fails to build in version 3.4.1.

Since this is a small library only and we really want
ccache to use compression, we will build this indepently
and let ccache use it from the system.

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

diff --git a/lfs/zlib b/lfs/zlib
index d0607513e8c2237f843d8d66795d8d91e3aff4a7..25c587aaca912cf6c03add12c9410128cd05e5f6 100644 (file)
--- a/lfs/zlib
+++ b/lfs/zlib
@@ -71,15 +71,17 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
-       cd $(DIR_APP) && ./configure --prefix=/usr --shared
+       cd $(DIR_APP) && ./configure --prefix=$(PREFIX) --shared
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
+ifneq "$(TOOLCHAIN)" "1"
        mv -v /usr/lib/libz.so.$(VER) /lib/libz.so.$(VER)
        ln -svf libz.so.$(VER) /lib/libz.so.1
        ln -svf libz.so.$(VER) /lib/libz.so
        rm -vf /usr/lib/libz.so.1
        rm -vf /usr/lib/libz.so
+endif
 
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index b2341dc2e5b186983eb784938340e68563672eae..6b55f8e90e2830a7a1bfcb1f705e559a656edac0 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -928,6 +928,7 @@ buildtoolchain() {
        lfsmake1 gcc                    PASS=L
        lfsmake1 binutils                       PASS=2
        lfsmake1 gcc                    PASS=2
+       lfsmake1 zlib
        lfsmake1 ccache                 PASS=2
        lfsmake1 tcl
        lfsmake1 expect