From 54d5414848653dcafb857d91adeb7f4ae9b1a1d9 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Mon, 12 Feb 2018 14:24:12 +0000 Subject: [PATCH] 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 --- lfs/zlib | 4 +++- make.sh | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lfs/zlib b/lfs/zlib index d0607513e8..25c587aaca 100644 --- 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 b2341dc2e5..6b55f8e90e 100755 --- 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 -- 2.39.2