X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fglibc;h=4530f2ddd6c3581ee8516401f404e07591419433;hp=985fe671c29f944e2f04234a0a2b8c2c98f8d21f;hb=50d1bbf0f56b76148f10bbe2195df45ad3b60cb3;hpb=97e4adb8fd8c1631ee42af5129a3e07175ff4995

diff --git a/lfs/glibc b/lfs/glibc
index 985fe671c2..4530f2ddd6 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -24,10 +24,10 @@
 
 include Config
 
-VER        = 2.25
+VER        = 2.28
 
 THISAPP    = glibc-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.xz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
@@ -80,7 +80,10 @@ EXTRA_CONFIG += \
 	--enable-add-ons \
 	--without-selinux \
 	--enable-experimental-malloc \
-	--enable-bind-now
+	--enable-bind-now \
+	--enable-obsolete-rpc \
+	--enable-obsolete-nsl \
+	--disable-nss-crypt
 
 ###############################################################################
 # Top-level Rules
@@ -90,7 +93,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0c9f827298841dbf3bff3060f3d7f19c
+$(DL_FILE)_MD5 = c81d2388896379997bc359d4f2084239
 
 install : $(TARGET)
 
@@ -122,7 +125,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	@mkdir $(DIR_SRC)/glibc-build
 
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-2.25-gcc-7.patch
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-localedef-no-archive.patch
 
 ifneq "$(TOOLCHAIN)" "1"
@@ -149,6 +151,8 @@ endif
 	cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
 		CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
 
+	cd $(DIR_APP) && sed '/test-installation/s@\$$(PERL)@echo not running@' -i Makefile
+
 	cd $(DIR_SRC)/glibc-build && make install
 
 ifneq "$(TOOLCHAIN)" "1"