From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sun, 15 Aug 2021 10:29:06 +0000 (+0200)
Subject: - build gconv cache in post to avoid pointing it to buildroot, rel 3
X-Git-Tag: auto/th/glibc-2.34-3
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=c70697910b75c3616445c01c02b3ac2303f61056;p=packages%2Fglibc.git

- build gconv cache in post to avoid pointing it to buildroot, rel 3
---

diff --git a/glibc.spec b/glibc.spec
index c8beafc..9519d8d 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -51,7 +51,7 @@ Summary(tr.UTF-8):	GNU libc
 Summary(uk.UTF-8):	GNU libc версії
 Name:		glibc
 Version:	%{core_version}
-Release:	2
+Release:	3
 Epoch:		6
 License:	LGPL v2.1+
 Group:		Libraries
@@ -1078,11 +1078,11 @@ PICFILES="libc_pic.a libc.map
 	math/libm_pic.a libm.map
 	resolv/libresolv_pic.a"
 
-install -p $PICFILES				$RPM_BUILD_ROOT%{_libdir}
-install -p elf/sofini.os				$RPM_BUILD_ROOT%{_libdir}/sofini.o
+install -p $PICFILES		$RPM_BUILD_ROOT%{_libdir}
+install -p elf/sofini.os	$RPM_BUILD_ROOT%{_libdir}/sofini.o
 
 # Include %{_libdir}/gconv/gconv-modules.cache
-$(pwd)/elf/ld.so --library-path $(pwd) ./iconv/iconvconfig --nostdlib --prefix=$RPM_BUILD_ROOT %{_libdir}/gconv -o $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.cache
+:> $RPM_BUILD_ROOT%{_libdir}/gconv/gconv-modules.cache
 cd ..
 
 %if %{without cross}
@@ -1412,6 +1412,9 @@ if [ "$1" = "0" ]; then
 	%groupremove nscd
 fi
 
+%post -n iconv
+%{_sbindir}/iconvconfig --nostdlib -o %{_libdir}/gconv/gconv-modules.cache %{_libdir}/gconv
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README NEWS