packages: dietlibc/dietlibc.spec - dynamic libs present on x86_64 as well, ...

[glen]

Author: glen                         Date: Fri Jul 30 15:49:45 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- dynamic libs present on x86_64 as well, add as bcond

---- Files affected:
packages/dietlibc:
   dietlibc.spec (1.91 -> 1.92) 

---- Diffs:

================================================================
Index: packages/dietlibc/dietlibc.spec
diff -u packages/dietlibc/dietlibc.spec:1.91 packages/dietlibc/dietlibc.spec:1.92
--- packages/dietlibc/dietlibc.spec:1.91	Thu Jul 29 10:53:50 2010
+++ packages/dietlibc/dietlibc.spec	Fri Jul 30 17:49:39 2010
@@ -2,7 +2,12 @@
 #
 # Conditional build:
 %bcond_with	ssp	# disable stack-smashing protector 'coz dietlibc will not work with it!
-#
+%bcond_without	dynamic	# dynamic lib support
+
+%ifnarch %{ix86} %{x8664} arm
+%undefine	with_dynamic
+%endif
+
 Summary:	C library optimized for size
 Summary(pl.UTF-8):	Biblioteka standardowa C zoptymalizowana na rozmiar
 Summary(pt_BR.UTF-8):	libc pequena otimizada para tamanho
@@ -53,6 +58,17 @@
 A diet libc e' uma libc otimizada para criar pequenos binários
 estaticamente linkados para Linux.
 
+%package libs
+Summary:	Dynamic libraries for dietlibc
+Group:		Libraries
+
+%description libs
+The diet libc is a libc that is optimized for small size. It can be
+used to create small statically linked binaries for Linux on alpha,
+arm, hppa, ia64, i386, mips, s390, sparc, sparc64, ppc and x86_64.
+
+This package contains the dynamic libraries for dietlibc.
+
 %package devel
 Summary:	Development files for dietlibc
 Summary(pl.UTF-8):	Pliki dla programistów używających dietlibc
@@ -114,7 +130,8 @@
 	prefix=%{dietprefix} \
 	CC="${CC#*ccache }"
 
-%ifarch %{ix86}
+%if %{with dynamic}
+# 'dyn' target is not SMP safe
 %{__make} -j1 dyn \
 	prefix=%{dietprefix} \
 	CC="${CC}"
@@ -135,6 +152,7 @@
 mv $RPM_BUILD_ROOT%{dietprefix}/man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1
 rm -rf $RPM_BUILD_ROOT%{dietprefix}/{bin,man}
 rm -f $RPM_BUILD_ROOT%{_bindir}/diet-dyn
+rm -f $RPM_BUILD_ROOT%{_bindir}/dnsd
 
 cat > $RPM_BUILD_ROOT%{_bindir}/%{_target_cpu}-dietlibc-gcc <<'EOF'
 #!/bin/sh
@@ -149,7 +167,10 @@
 %doc AUTHOR BUGS CAVEAT CHANGES FAQ README THANKS TODO
 %dir %{dietprefix}
 %dir %{dietprefix}/lib-%{libarch}
-%ifarch %{ix86}
+
+%if %{with dynamic}
+%files libs
+%defattr(644,root,root,755)
 %attr(755,root,root) %{dietprefix}/lib-%{libarch}/*.so
 %{_sysconfdir}/diet.ld.conf
 %endif
@@ -174,6 +195,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.92  2010/07/30 15:49:39  glen
+- dynamic libs present on x86_64 as well, add as bcond
+
 Revision 1.91  2010/07/29 08:53:50  glen
 - release 4
 
@@ -302,7 +326,7 @@
 
 Revision 1.52  2005/02/09 18:58:30  darekr
 - 0.28
-- removed obsoleted patch, sorted files in %%doc
+- removed obsoleted patch, sorted files in %doc
 
 Revision 1.51  2004/08/27 16:02:24  pluto
 - typo.
@@ -412,7 +436,7 @@
 
 Revision 1.19  2002/08/06 19:58:22  marcus
 - new version 0.19 (dynlinker on ppc still not ready)
-- use new %%doc
+- use new %doc
 
 Revision 1.18  2002/08/06 18:20:30  marcus
 - start upgrade to 0.18
@@ -429,14 +453,14 @@
 
 Revision 1.14  2002/05/11 19:53:54  marcus
 - added ExclusiveArch: due to: libdl/_dl_rel.h:22: #error "_dl_rel.h: NOT SUPPORTED"
-on PPC
+  on PPC
 - rel.2.
 
 Revision 1.13  2002/05/11 10:47:22  kloczek
 - updated to 0.17 and merge translations from Conectiva.
 
 Revision 1.12  2002/04/25 16:11:55  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.11  2002/03/15 14:22:55  malekith
 - source is .bz2 not .gz
@@ -451,13 +475,13 @@
   Group field using gettext).
 
 Revision 1.8  2002/01/18 02:12:42  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.7  2001/11/21 14:56:16  qboosh
 - adapterized, pl translations
 
 Revision 1.6  2001/08/23 16:51:16  filon
-- changed: make -> %%{__make}
+- changed: make -> %{__make}
 
 Revision 1.5  2001/04/10 14:15:16  klakier
 - cvs ver 20010410
@@ -470,5 +494,4 @@
 
 Revision 1.2  2001/04/04 20:53:00  kloczek
 - partialy rewrited and updated to 0.8.
-
-Based on MDK spec file.
+  Based on MDK spec file.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dietlibc/dietlibc.spec?r1=1.91&r2=1.92&f=u