From: Andreas Schwab <schwab@redhat.com>
Date: Fri, 28 Aug 2009 08:35:07 +0000 (+0200)
Subject: Merge branch 'fedora/master' of sourceware.org:/git/glibc into fedora/master
X-Git-Tag: fedora/glibc-2.10.90-18~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62f946ade44beeabffb8e91c989ff2bd47293e4c;p=thirdparty%2Fglibc.git

Merge branch 'fedora/master' of sourceware.org:/git/glibc into fedora/master

Conflicts:
	fedora/glibc.spec.in
---

62f946ade44beeabffb8e91c989ff2bd47293e4c
diff --cc fedora/glibc.spec.in
index 4eeb08f66fc,eabd17783d6..eeb45f474c9
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@@ -347,7 -347,9 +347,8 @@@ build_CFLAGS="$BuildFlags -g -O3 $*
  %ifarch %{multiarcharches}
  	--enable-multi-arch \
  %endif
 -	--disable-profile --enable-experimental-malloc --enable-nss-crypt ||
 -{ cat config.log ; false }
 +	--disable-profile --enable-experimental-malloc --enable-nss-crypt
+ 
  make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
  
  cd ..