X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fklibc;h=0ff12f3ee05145127fa151a1742af826a9f89e52;hp=9d3bf909148bf24d428ef9cc83d84272612ea385;hb=98cbb7e6827f8c66de84066db6fb84122e570209;hpb=81e974f3628aa2b617b6ff64722661367092885e

diff --git a/lfs/klibc b/lfs/klibc
index 9d3bf90914..0ff12f3ee0 100644
--- a/lfs/klibc
+++ b/lfs/klibc
@@ -1,22 +1,20 @@
 ###############################################################################
-# This file is part of the IPCop Firewall.                                    #
 #                                                                             #
-# IPCop is free software; you can redistribute it and/or modify               #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
-# the Free Software Foundation; either version 2 of the License, or           #
+# the Free Software Foundation, either version 3 of the License, or           #
 # (at your option) any later version.                                         #
 #                                                                             #
-# IPCop is distributed in the hope that it will be useful,                    #
+# This program is distributed in the hope that it will be useful,             #
 # but WITHOUT ANY WARRANTY; without even the implied warranty of              #
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
 # GNU General Public License for more details.                                #
 #                                                                             #
 # You should have received a copy of the GNU General Public License           #
-# along with IPCop; if not, write to the Free Software                        #
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
-#                                                                             #
-# Makefiles are based on LFSMake, which is                                    #
-# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
 #                                                                             #
 ###############################################################################
 
@@ -26,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)
@@ -44,7 +42,7 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 klibc-extras-2.2.tar.gz = $(DL_FROM)/klibc-extras-2.2.tar.gz
 
-$(DL_FILE)_MD5 = d55ce89c0656a7d6896ec0b2af07b5dc
+$(DL_FILE)_MD5 = 030d978a7f16800e8ccae12d6fb5e7ba
 klibc-extras-2.2.tar.gz_MD5 = 7e5042978531048c369f59ca1a13055b
 
 install : $(TARGET)
@@ -74,13 +72,13 @@ $(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)/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