packages: glibc/glibc.spec - preload ld.so, too (before calling iconvconfig)

[arekm]

Author: arekm                        Date: Sat Jun 30 21:24:51 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- preload ld.so, too (before calling iconvconfig)

---- Files affected:
packages/glibc:
   glibc.spec (1.961 -> 1.962) 

---- Diffs:

================================================================
Index: packages/glibc/glibc.spec
diff -u packages/glibc/glibc.spec:1.961 packages/glibc/glibc.spec:1.962
--- packages/glibc/glibc.spec:1.961	Sat Jun 30 23:13:57 2012
+++ packages/glibc/glibc.spec	Sat Jun 30 23:24:46 2012
@@ -1076,7 +1076,7 @@
 install -p elf/sofini.os				$RPM_BUILD_ROOT%{_libdir}/sofini.o
 
 # Include %{_libdir}/gconv/gconv-modules.cache
-LD_PRELOAD=$(pwd)/libc.so.6 ./iconv/iconvconfig --nostdlib --prefix=$RPM_BUILD_ROOT %{_libdir}/gconv -o $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.cache
+LD_PRELOAD=$(pwd)/elf/ld.so:$(pwd)/libc.so.6 ./iconv/iconvconfig --nostdlib --prefix=$RPM_BUILD_ROOT %{_libdir}/gconv -o $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.cache
 cd ..
 
 %if %{without cross}
@@ -1812,6 +1812,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.962  2012/06/30 21:24:46  arekm
+- preload ld.so, too (before calling iconvconfig)
+
 Revision 1.961  2012/06/30 21:13:57  arekm
 - start glibc 2.16 update; bunch of patches needs reevaluation; fails on install
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/glibc/glibc.spec?r1=1.961&r2=1.962