From 293c21e909b5610b50ae395f9e70e90c7ef53288 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Sat, 7 Feb 2015 18:25:11 +0100
Subject: [PATCH] glibc: update to glibc-2.21

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 packages/devel/glibc/package.mk               |  8 ++++--
 .../patches/glibc-allow-newer-autoconf.patch  | 28 -------------------
 2 files changed, 6 insertions(+), 30 deletions(-)
 delete mode 100644 packages/devel/glibc/patches/glibc-allow-newer-autoconf.patch

diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk
index 6f7be0c80d..4f8f4ade35 100644
--- a/packages/devel/glibc/package.mk
+++ b/packages/devel/glibc/package.mk
@@ -17,12 +17,12 @@
 ################################################################################
 
 PKG_NAME="glibc"
-PKG_VERSION="2.20"
+PKG_VERSION="2.21"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.gnu.org/software/libc/"
-PKG_URL="ftp://ftp.gnu.org/pub/gnu/glibc/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://ftp.gnu.org/pub/gnu/glibc/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="ccache:host autotools:host autoconf:host linux:host gcc:bootstrap"
 PKG_DEPENDS_INIT="glibc"
 PKG_PRIORITY="optional"
@@ -85,6 +85,10 @@ pre_configure_target() {
   export CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-O2|g"`
   export CFLAGS=`echo $CFLAGS | sed -e "s|-O.|-O2|g"`
 
+  if [ -n "$PROJECT_CFLAGS" ]; then
+    export CFLAGS=`echo $CFLAGS | sed -e "s|$PROJECT_CFLAGS||g"`
+  fi
+
   export LDFLAGS=`echo $LDFLAGS | sed -e "s|-ffast-math||g"`
   export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Ofast|-O2|g"`
   export LDFLAGS=`echo $LDFLAGS | sed -e "s|-O.|-O2|g"`
diff --git a/packages/devel/glibc/patches/glibc-allow-newer-autoconf.patch b/packages/devel/glibc/patches/glibc-allow-newer-autoconf.patch
deleted file mode 100644
index 33d7ead14d..0000000000
--- a/packages/devel/glibc/patches/glibc-allow-newer-autoconf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b702bd4fdb4aaebb6aadb3ce773bcc9eea8d2dc8 Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Thu, 24 Apr 2014 22:05:37 +0300
-Subject: [PATCH] allow newer autoconf
-
----
- aclocal.m4 |    5 -----
- 1 files changed, 0 insertions(+), 5 deletions(-)
-
-diff --git a/aclocal.m4 b/aclocal.m4
-index bc48586..0e3c7f4 100644
---- a/aclocal.m4
-+++ b/aclocal.m4
-@@ -2,11 +2,6 @@ dnl We require that everyone use exactly the same Autoconf version so that
- dnl the internal functions defined and used by the main configure script
- dnl match those expected by the fragments.
- m4_define([GLIBC_AUTOCONF_VERSION], [2.68])
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), GLIBC_AUTOCONF_VERSION, [],
--      [m4_fatal(m4_flatten(
--Exactly version GLIBC_AUTOCONF_VERSION of Autoconf is required but you have
--m4_defn([AC_AUTOCONF_VERSION])
--), [63])])dnl
- dnl
- dnl We define the macro GLIBC_PROVIDES to do an AC_PROVIDE for each macro
- dnl which appears in configure.ac before the sysdep configure scripts are run.
--- 
-1.7.2.5
-