From 0b9a6aec0b22c9e136cffe19072f3268ca397642 Mon Sep 17 00:00:00 2001
From: Andrey Bondrov <andrey.bondrov@rosalab.ru>
Date: Mon, 23 Jun 2014 21:01:42 +1100
Subject: [PATCH] Merge some fixes from Cooker to fix issues with building
 locales

---
 glibc.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/glibc.spec b/glibc.spec
index bfbb6ff..b2cc919 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -953,6 +953,7 @@ function BuildGlibc() {
       BuildCompFlags="-march=armv6"
       ;;
   esac
+  BuildCompFlags="$BuildCompFlags -fuse-ld=bfd"
 
   # Choose multiarch support
   MultiArchFlags=
@@ -1007,7 +1008,7 @@ function BuildGlibc() {
   mkdir  build-$arch-linux
   pushd  build-$arch-linux
   [[ "$BuildAltArch" = "yes" ]] && touch ".alt" || touch ".main"
-  CC="$BuildCC" CXX="$BuildCXX" CFLAGS="$BuildFlags" LDFLAGS="%{ldflags}" ../configure \
+  CC="$BuildCC" CXX="$BuildCXX" CFLAGS="$BuildFlags" LDFLAGS="%{ldflags} -fuse-ld=bfd" ../configure \
     $arch-%{_target_vendor}-%{_target_os}%{?_gnu} \
     --prefix=%{_prefix} \
     --libexecdir=%{_prefix}/libexec \
@@ -1303,7 +1304,7 @@ rm -f %{buildroot}%{_infodir}/dir
 %if ! %{without locales}
 # Build locales...
 export PATH=%{buildroot}%{_bindir}:%{buildroot}%{_sbindir}:$PATH
-#export LD_LIBRARY_PATH=%{buildroot}/%{_lib}:%{buildroot}%{_libdir}:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=%{buildroot}/%{_lib}:%{buildroot}%{_libdir}:$LD_LIBRARY_PATH
 export I18NPATH=%{buildroot}%{_datadir}/i18n
 
 # make default charset pseudo-locales
@@ -1318,7 +1319,9 @@ do
 done
 
 # Build regular locales
-SUPPORTED=$I18NPATH/SUPPORTED DESTDIR=%{buildroot} %make -f %{SOURCE20}
+# Don't try to use SMP make here - that would result in concurrent writes to the locale
+# archive.
+SUPPORTED=$I18NPATH/SUPPORTED DESTDIR=%{buildroot} make -f %{SOURCE20}
 # Locale related tools
 install -c -m 755 %{SOURCE1001} %{SOURCE1002} %{buildroot}%{_bindir}/
 # And configs