X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fklibc;h=1ab1215f7f6d540e6148c21acbe61ffb95386332;hp=4b0485019e69c674a7a400596c10598a375b9647;hb=0e067ff3baffcaf9840982aa46cacfe7508a782f;hpb=202f35e29c3e1c2d48df292943370487e92a671b

diff --git a/lfs/klibc b/lfs/klibc
index 4b0485019e..1ab1215f7f 100644
--- a/lfs/klibc
+++ b/lfs/klibc
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 1.5
+VER        = 1.5.14
 
 THISAPP    = klibc-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -37,13 +37,16 @@ TARGET     = $(DIR_INFO)/$(THISAPP)
 ###############################################################################
 
 objects = $(DL_FILE) \
-		klibc-extras-2.2.tar.gz
+		klibc-extras-2.2.tar.gz \
+		klibc-1.5.14-linux2.6.27-includes.tar.bz2
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 klibc-extras-2.2.tar.gz = $(DL_FROM)/klibc-extras-2.2.tar.gz
+klibc-1.5.14-linux2.6.27-includes.tar.bz2 = $(DL_FROM)/klibc-1.5.14-linux2.6.27-includes.tar.bz2
 
-$(DL_FILE)_MD5 = d55ce89c0656a7d6896ec0b2af07b5dc
+$(DL_FILE)_MD5 = 030d978a7f16800e8ccae12d6fb5e7ba
 klibc-extras-2.2.tar.gz_MD5 = 7e5042978531048c369f59ca1a13055b
+klibc-1.5.14-linux2.6.27-includes.tar.bz2_MD5 = 1f875129d35193e35d27ed2b61a80bb6
 
 install : $(TARGET)
 
@@ -72,16 +75,15 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) $(DIR_SRC)/klibc* && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) && \
+	@rm -rf $(DIR_APP) $(DIR_SRC)/klibc* && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) && \
 		tar zxf $(DIR_DL)/klibc-extras-2.2.tar.gz
-	cd $(DIR_APP) && ln -fs ../linux linux
+	cd $(DIR_SRC) && tar jxf $(DIR_DL)/klibc-1.5.14-linux2.6.27-includes.tar.bz2
+
 	cd $(DIR_SRC)/klibc-extras && sed -i "s|^INSTALL = .*|INSTALL = /usr/bin/install -c -m 755|g" Makefile
-	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_APP) && make install
-	cd $(DIR_SRC)/klibc-extras && make
+	cd $(DIR_SRC)/klibc-extras && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_SRC)/klibc-extras && make install
 	ln -sf sh.shared /usr/lib/klibc/bin/sh
-	#mv /lib/klibc-*.so /lib/klibc-pFXBYGYRiBAAryaZ7Zw_ISKpcTk.so
-	#mv /usr/lib/klibc/lib/klibc-*.so /usr/lib/klibc/lib/klibc-pFXBYGYRiBAAryaZ7Zw_ISKpcTk.so
 	@rm -rf $(DIR_APP) $(DIR_SRC)/klibc*
 	@$(POSTBUILD)