X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fglibc;h=4530f2ddd6c3581ee8516401f404e07591419433;hp=061bf8c2b47ed42b361c9a88452c013f580dce21;hb=50d1bbf0f56b76148f10bbe2195df45ad3b60cb3;hpb=727ac931479d2c67f50692d5ac3807b1bf9d5dee

diff --git a/lfs/glibc b/lfs/glibc
index 061bf8c2b4..4530f2ddd6 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2018  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # 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        #
@@ -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)
 
@@ -59,7 +59,11 @@ ifeq "$(BUILD_ARCH)" "armv7hl"
 endif
 
 ifeq "$(BUILD_ARCH)" "i586"
-	CFLAGS += -march=i586 -mtune=generic -mno-tls-direct-seg-refs
+	CFLAGS += -march=i586 -mtune=generic -mindirect-branch=thunk -mfunction-return=thunk -mno-tls-direct-seg-refs
+endif
+
+ifeq "$(BUILD_ARCH)" "x86_64"
+	CFLAGS += -mindirect-branch=thunk -mfunction-return=thunk
 endif
 
 # Disable hardware FP for armv5tel
@@ -76,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
@@ -86,7 +93,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 0c9f827298841dbf3bff3060f3d7f19c
+$(DL_FILE)_MD5 = c81d2388896379997bc359d4f2084239
 
 install : $(TARGET)
 
@@ -144,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"