From b9b83891ab1cd3bbe739c316d47e998cc620b816 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 31 Dec 2009 05:18:18 +0100
Subject: [PATCH] glibc: update to 2.11.1.

--HG--
extra : convert_revision : d27080b6861ce332db2e69134c686250dd70d60a
---
 srcpkgs/glibc/glibc-devel.template |  2 --
 srcpkgs/glibc/template             | 15 ++++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/glibc/glibc-devel.template b/srcpkgs/glibc/glibc-devel.template
index 7f5939b321..44104915f8 100644
--- a/srcpkgs/glibc/glibc-devel.template
+++ b/srcpkgs/glibc/glibc-devel.template
@@ -7,8 +7,6 @@ long_desc="${long_desc}
 
 Add_dependency run glibc
 
-revision=1
-
 do_install()
 {
 	mkdir -p ${DESTDIR}/usr/lib
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 281df2f8dd..bd5e377a78 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,9 +1,9 @@
 # Template file for 'glibc'
 pkgname=glibc
-version=2.11
-revision=2
+version=2.11.1
 distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.bz2"
 build_style=gnu_configure
+build_wrksrc="build"
 configure_script="../configure"
 configure_args="--with-tls -disable-profile --with-__thread
  --enable-kernel=2.6.27 --enable-add-ons --without-gd
@@ -13,7 +13,7 @@ configure_args="--with-tls -disable-profile --with-__thread
 make_install_target="install_root=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="The GNU C library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=9ef10e498fac4acc458029898fd8fa76c3cedee1f63d23fedf0c579c505ed62c
+checksum=64e01d0cfc964a8d8a8c74b5d36bd655e800c12d22b756dd84d867148a595fa1
 long_desc="
  The GNU C Library is the standard system C library for all GNU systems,
  and is an important part of what makes up a GNU system.  It provides the
@@ -35,13 +35,12 @@ Add_dependency run	glibc-locales
 pre_configure()
 {
 	# We must configure it in another directory.
-	wrksrc=$wrksrc/build_obj
-	mkdir -p $wrksrc
-	echo "slibdir=/lib" > $wrksrc/configparms
+	mkdir -p ${build_wrksrc}
+	echo "slibdir=/lib" > ${build_wrksrc}/configparms
 	# glibc fails to build if -march not set for a minimal cpu.
 	if [ "$xbps_machine" != "x86_64" ]; then
 		echo "CFLAGS+=-march=${xbps_machine%%-*} -mtune=generic" \
-			>> $wrksrc/configparms
+			>> ${build_wrksrc}/configparms
 	fi
 }
 
@@ -81,6 +80,4 @@ post_install()
 	) > ${DESTDIR}/etc/nsswitch.conf
 
 	rm -f ${DESTDIR}/etc/ld.so.cache
-
-	wrksrc=${wrksrc%%/build_obj}
 }