- rel 6

[packages/dietlibc.git] / dietlibc.spec

diff --git a/dietlibc.spec b/dietlibc.spec
index 1738ea3ee20a2715992fc0fe0b6416ae35b7150e..b81abd87742d6b4a23364ed017b3c39ac4c0b98a 100644 (file)
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -1,13 +1,18 @@
 #
 # 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
 Name:          dietlibc
 Version:       0.32
-Release:       3
+Release:       6
 Epoch:         2
 License:       GPL v2
 Group:         Development/Libraries
@@ -30,6 +35,7 @@ Patch12:      %{name}-noexecstacks.patch
 Patch13:       %{name}-strcoll.patch
 Patch15:       %{name}-memalign.patch
 Patch16:       %{name}-getsubopt.patch
+Patch17:       %{name}-devmacros.patch
 URL:           http://www.fefe.de/dietlibc/
 BuildRequires: rpmbuild(macros) >= 1.566
 BuildRequires: sed >= 4.0
@@ -52,6 +58,17 @@ Niewielka libc do budowania aplikacji wbudowanych.
 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
@@ -98,6 +115,7 @@ statyczne.
 %patch13 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
 
 %if "%{cc_version}" < "3.4"
 %{__sed} -i -e '/CFLAGS/ s/-Wextra//' Makefile
@@ -113,9 +131,11 @@ sparc32 \
        prefix=%{dietprefix} \
        CC="${CC#*ccache }"
 
-%ifarch %{ix86}
+%if %{with dynamic}
+# 'dyn' target is not SMP safe
 %{__make} -j1 dyn \
-       prefix=%{dietprefix}
+       prefix=%{dietprefix} \
+       CC="${CC}"
 %endif
 
 %install
@@ -133,6 +153,7 @@ mv $RPM_BUILD_ROOT%{dietprefix}/bin/* $RPM_BUILD_ROOT%{_bindir}
 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
@@ -147,7 +168,10 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -156,7 +180,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*-dietlibc-gcc
 %attr(755,root,root) %{_bindir}/diet
-%attr(755,root,root) %{_bindir}/dnsd
 %attr(755,root,root) %{_bindir}/elftrunc
 %{dietprefix}/lib-%{libarch}/*.o
 %{dietprefix}/include