[packages/glibc] - builds; patch18 needs update

arekm arekm at pld-linux.org
Fri Aug 16 23:32:32 CEST 2013


commit aca0117e86a7d798e1f6141b98d0b12a28479336
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Aug 16 23:32:26 2013 +0200

    - builds; patch18 needs update

 glibc.spec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/glibc.spec b/glibc.spec
index 4fbcbd5..bf85a05 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -100,7 +100,7 @@ BuildRequires:	gcc >= 6:4.3
 BuildRequires:	gettext-devel >= 0.10.36
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.18}
 BuildRequires:	linux-libc-headers >= %{llh_version}
-BuildRequires:	nss-devel >= 1:3.12.3
+BuildRequires:	nss-devel >= 1:3.15.1-2
 BuildRequires:	perl-base
 BuildRequires:	rpm-build >= 4.3-0.20030610.28
 BuildRequires:	rpmbuild(macros) >= 1.567
@@ -1080,7 +1080,7 @@ install -p elf/soinit.os				$RPM_BUILD_ROOT%{_libdir}/soinit.o
 install -p elf/sofini.os				$RPM_BUILD_ROOT%{_libdir}/sofini.o
 
 # Include %{_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
+$(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
 cd ..
 
 %if %{without cross}
@@ -1275,8 +1275,6 @@ install localedata/SUPPORTED $RPM_BUILD_ROOT%{_datadir}/i18n
 # shutup check-files
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/README.*
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
-# we don't support kernel without ptys support
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/pt_chown
 # rpcinfo dropped from glibc, provided by rpcbind now
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/{,*/}man8/rpcinfo.8
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/glibc.git/commitdiff/aca0117e86a7d798e1f6141b98d0b12a28479336



More information about the pld-cvs-commit mailing list