SPECS (DEVEL): glibc.spec - fix postshell/postinst build. use klib...

[pluto]

Author: pluto                        Date: Tue Mar  7 20:50:34 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- fix postshell/postinst build. use klibc for smaller binaries.

---- Files affected:
SPECS:
   glibc.spec (1.590.2.34 -> 1.590.2.35) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.590.2.34 SPECS/glibc.spec:1.590.2.35
--- SPECS/glibc.spec:1.590.2.34	Tue Mar  7 21:23:11 2006
+++ SPECS/glibc.spec	Tue Mar  7 21:50:27 2006
@@ -50,6 +50,8 @@
 Source6:	%{name}-non-english-man-pages.tar.bz2
 # Source6-md5:	6159f0a9b6426b5f6fc1b0d8d21b9b76
 Source7:	%{name}-localedb-gen
+Source8:	postshell.c
+Source9:	%{name}-LD-path.c
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-pl.po-update.patch
 Patch2:		%{name}-pld.patch
@@ -85,6 +87,7 @@
 BuildRequires:	gawk
 %{?with_memusage:BuildRequires:	gd-devel >= 2.0.1}
 BuildRequires:	gettext-devel >= 0.10.36
+BuildRequires:	klibc-static
 %{?with_selinux:BuildRequires:	libselinux-devel >= 1.18}
 BuildRequires:	linux-libc-headers >= %{llh_version}
 BuildRequires:	perl-base
@@ -876,9 +879,9 @@
 %endif
 
 %if %{without cross}
-# compiling static using diet vs glibc saves 400k
-diet -Os %{__cc} %{SOURCE8} %{rpmcflags} -static -o postshell
-diet -Os %{__cc} %{SOURCE7} %{rpmcflags} -static -o glibc-postinst
+# compiling static using klibc vs glibc saves 490k
+klcc %{__cc} %{SOURCE8} %{rpmcflags} -static -o postshell
+klcc %{__cc} %{SOURCE9} %{rpmcflags} -static -o glibc-postinst
 %endif
 
 %install
@@ -1043,8 +1046,8 @@
 -/bin/cp -f /etc/ld.so.conf /etc/ld.so.conf.rpmsave
 -/bin/sed -i -e '1iinclude ld.so.conf.d/*.conf' /etc/ld.so.conf
 
-%post  memusage -p /sbin/ldconfig
-%postun memusage -p /sbin/ldconfig
+%post	memusage -p /sbin/ldconfig
+%postun	memusage -p /sbin/ldconfig
 
 %post -n iconv -p %{_sbindir}/iconvconfig
 
@@ -1414,6 +1417,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.590.2.35  2006/03/07 20:50:27  pluto
+- fix postshell/postinst build. use klibc for smaller binaries.
+
 Revision 1.590.2.34  2006/03/07 20:23:11  arekm
 - merge parts from AC-branch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.590.2.34&r2=1.590.2.35&f=u