]> git.ipfire.org Git - ipfire-3.x.git/commitdiff
Revert "Updated glibc to 2.8 (fedora release)."
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Jun 2008 09:16:55 +0000 (09:16 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Jun 2008 09:16:55 +0000 (09:16 +0000)
This reverts commit d54211690bb77ceecb2383bfb556101ed195dc62.

lfs/glibc

index 45b3009fcf02cba7f26b295cb915fc08bffe7903..bc74de6979a16cc0865fffd742b743e4e4f26417 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = glibc
-VER        = 20080412T0741
+VER        = 2.7
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -57,6 +57,7 @@ endif
 ###############################################################################
 
 objects = $(DL_FILE) \
+       glibc-libidn-$(VER).tar.bz2 \
        $(THISAPP)-pt_pax-1.patch \
        $(THISAPP)-ssp_hp-timing-1.patch \
        $(THISAPP)-arc4_prng-1.patch \
@@ -111,10 +112,13 @@ endif
 endif
 
 ifeq "$(STAGE)" "base"
+       tar jxf $(DIR_DL)/glibc-libidn-$(VER).tar.bz2 -C $(DIR_APP)
+       cd $(DIR_APP) && mv glibc-libidn-$(VER) libidn
 ifeq "$(SSP)" "1"
 ifeq "$(MACHINE)" "i686"
        cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-ssp_hp-timing-1.patch
 endif
+       #cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-wur-1.patch
 endif
        cd $(DIR_APP) && sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED
        cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$(LINKER) -o|' \