SPECS (AC-branch): glibc.spec - audit-libs used only if building w...

[qboosh]

Author: qboosh                       Date: Mon Nov 14 22:37:55 2005 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- audit-libs used only if building with selinux
- using diet breaks cross bootstrap builds - disabling it if cross

---- Files affected:
SPECS:
   glibc.spec (1.583.2.53 -> 1.583.2.54) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.583.2.53 SPECS/glibc.spec:1.583.2.54
--- SPECS/glibc.spec:1.583.2.53	Sat Nov 12 17:54:27 2005
+++ SPECS/glibc.spec	Mon Nov 14 23:37:50 2005
@@ -131,7 +131,7 @@
 Patch29:	%{name}-pax_dl-execstack.patch
 Patch30:	%{name}-large_collate_tables.patch
 URL:		http://www.gnu.org/software/libc/
-BuildRequires:	audit-libs-devel
+%{?with_selinux:BuildRequires:	audit-libs-devel}
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	binutils >= 2:2.15.90.0.3
@@ -996,9 +996,11 @@
 done
 %endif
 
+%if %{without cross}
 # compiling static using diet vs glibc saves 400k
 diet -Os %{__cc} %{SOURCE9} %{rpmcflags} -static -o postshell
 diet -Os %{__cc} %{SOURCE8} %{rpmcflags} -static -o glibc-postinst
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -1026,8 +1028,10 @@
 install elf/sofini.os				$RPM_BUILD_ROOT%{_libdir}/sofini.o
 cd ..
 
+%if %{without cross}
 install postshell					$RPM_BUILD_ROOT/sbin
 install glibc-postinst				$RPM_BUILD_ROOT/sbin
+%endif
 
 %if %{with dual}
 env LANGUAGE=C LC_ALL=C \
@@ -1230,6 +1234,7 @@
 # don't run iconvconfig in %%postun -n iconv because iconvconfig doesn't exist
 # when %%postun is run
 
+%if %{without cross}
 %ifarch %{x8664} ppc64 s390x sparc64
 %post	-n %{name}64 -p /sbin/postshell
 %else
@@ -1261,6 +1266,7 @@
 %endif
 -/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
+%endif
 
 %post	memusage -p /sbin/ldconfig
 %postun memusage -p /sbin/ldconfig
@@ -1312,8 +1318,10 @@
 %endif
 %defattr(644,root,root,755)
 %doc README NEWS FAQ BUGS
+%if %{without cross}
 %attr(755,root,root) /sbin/postshell
 %attr(755,root,root) /sbin/glibc-postinst
+%endif
 %attr(755,root,root) /sbin/ldconfig
 # ld* and libc.so.6 SONAME symlinks must be in package because of
 # chicken-egg problem (postshell is dynamically linked with libc);
@@ -1665,6 +1673,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.583.2.54  2005/11/14 22:37:50  qboosh
+- audit-libs used only if building with selinux
+- using diet breaks cross bootstrap builds - disabling it if cross
+
 Revision 1.583.2.53  2005/11/12 16:54:27  areq
 - gcc 4.0 is OK
 
================================================================

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