- rel 12; add missing loop.h definitions

[packages/dietlibc.git] / dietlibc.spec

diff --git a/dietlibc.spec b/dietlibc.spec
index 9dfa17d45fe79345ba63152e1162db5b8b841fd5..bd307fcf448edac999cc4c66e5edb85ed4ace3b5 100644 (file)
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -1,18 +1,23 @@
 #
 # 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.31
-Release:       5
+Version:       0.32
+Release:       12
 Epoch:         2
 License:       GPL v2
 Group:         Development/Libraries
 Source0:       http://www.kernel.org/pub/linux/libs/dietlibc/%{name}-%{version}.tar.bz2
-# Source0-md5: acb98d469ee932d902fdf6de07802b7c
+# Source0-md5: 0098761c17924c15e21d25acdda4a8b5
 Patch0:                %{name}-ppc.patch
 Patch1:                %{name}-opt.patch
 Patch2:                %{name}-platform.patch
@@ -28,28 +33,50 @@ Patch10:    %{name}-fflush-null.patch
 Patch11:       %{name}-_syscall-no-arch.patch
 Patch12:       %{name}-noexecstacks.patch
 Patch13:       %{name}-strcoll.patch
-Patch14:       %{name}-cvs.patch
+Patch15:       %{name}-memalign.patch
+Patch16:       %{name}-getsubopt.patch
+Patch17:       %{name}-devmacros.patch
+Patch18:       %{name}-bloat.patch
+Patch19:       %{name}-notify.patch
+Patch20:       %{name}-loop.patch
 URL:           http://www.fefe.de/dietlibc/
+BuildRequires: rpmbuild(macros) >= 1.566
+BuildRequires: sed >= 4.0
 %ifarch sparc sparcv9
 BuildRequires: sparc32
 %endif
-BuildRequires: dos2unix
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                dietprefix      %{_prefix}/lib/dietlibc
 # for some reason known only to rpm there must be "\\|" not "\|" here
-%define                libarch         %(echo %{_target_cpu} | sed -e 's/i.86\\|pentium.\\|athlon/i386/;s/amd64/x86_64/;s/armv.*/arm/')
+%define                libarch         %(echo %{_target_cpu} | sed -e 's/i.86\\|pentium.\\|athlon/i386/;s/amd64/x86_64/;s/armv.*/arm/;s/sparcv.*/sparc/')
 
 %description
-Small libc for building embedded applications.
+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.
 
 %description -l pl.UTF-8
-Niewielka libc do budowania aplikacji wbudowanych.
+diet libc to biblioteka libc zoptymalizowana pod kątem rozmiaru.
+Może być używana do tworzenia małych, statycznie zlinkowanych
+binariów dla Linuksa na architekturach alpha, arm, hppa, ia64, i386,
+mips, s390, sparc, sparc64, ppc i x86_64.
 
 %description -l pt_BR.UTF-8
 A diet libc e' uma libc otimizada para criar pequenos binários
 estaticamente linkados para Linux.
 
+%package libs
+Summary:       Shared dietlibc libraries
+Summary(pl.UTF-8):     Biblioteki współdzielone dietlibc
+Group:         Libraries
+
+%description libs
+This package contains the shared dietlibc libraries.
+
+%description libs -l pl.UTF-8
+Ten pakiet zawiera biblioteki współdzielone dietlibc.
+
 %package devel
 Summary:       Development files for dietlibc
 Summary(pl.UTF-8):     Pliki dla programistów używających dietlibc
@@ -78,9 +105,8 @@ Niewielka libc do budowania aplikacji wbudowanych - biblioteki
 statyczne.
 
 %prep
-dos2unix arm/md5asm.S
 %setup -q
-%patch14 -p1
+%undos arm/md5asm.S
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -95,19 +121,32 @@ dos2unix arm/md5asm.S
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p0
+%patch19 -p1
+%patch20 -p1
+
+%if "%{cc_version}" < "3.4"
+%{__sed} -i -e '/CFLAGS/ s/-Wextra//' Makefile
+%endif
 
 %build
 export OPTFLAGS="%{rpmcflags}%{?with_ssp: -fno-stack-protector} -fno-strict-aliasing"
+CC="%{__cc}"
 %ifarch sparc sparcv9
 sparc32 \
 %endif
 %{__make} -j1 all \
        prefix=%{dietprefix} \
-       CC="%{__cc}"
-%ifarch %{ix86}
+       CC="${CC#*ccache }"
+
+%if %{with dynamic}
+# 'dyn' target is not SMP safe
 %{__make} -j1 dyn \
        prefix=%{dietprefix} \
-       CC="%{__cc}"
+       CC="${CC}"
 %endif
 
 %install
@@ -125,10 +164,11 @@ 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
+cat > $RPM_BUILD_ROOT%{_bindir}/%{_target_cpu}-dietlibc-gcc <<'EOF'
 #!/bin/sh
-exec %{_bindir}/diet gcc "\$@"
+exec %{_bindir}/diet gcc "$@"
 EOF
 
 %clean
@@ -139,7 +179,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
@@ -148,7 +191,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