- up to 0.30

[packages/dietlibc.git] / dietlibc.spec

diff --git a/dietlibc.spec b/dietlibc.spec
index 3c45877f084274d535cbd0bc072b5d4034d24f49..2a1d656e8023d22715071997cea603adbec65d1d 100644 (file)
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -1,17 +1,29 @@
+#
+# Conditional build:
+%bcond_with    ssp     # disable stack-smashing protector 'coz dietlibc will not work with it!
+#
 Summary:       C library optimized for size
 Summary(pl):   Biblioteka standardowa C zoptymalizowana na rozmiar
-Summary(pt_BR): libc pequena otimizada para tamanho
+Summary(pt_BR):        libc pequena otimizada para tamanho
 Name:          dietlibc
-Version:       0.18
+Version:       0.30
 Release:       1
 Epoch:         2
 License:       GPL v2
 Group:         Development/Libraries
-Source0:       http://www.fefe.de/dietlibc/%{name}-%{version}.tar.bz2
+Source0:       http://www.kernel.org/pub/linux/libs/dietlibc/%{name}-%{version}.tar.bz2
+# Source0-md5: 2465d652fff6f1fad3da3b98e60e83c9
 Patch0:                %{name}-ppc.patch
+Patch1:                %{name}-opt.patch
+Patch2:                %{name}-platform.patch
+Patch3:                %{name}-gcc4.patch
 URL:           http://www.fefe.de/dietlibc/
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                dietprefix      %{_prefix}/%{_target_cpu}-linux-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/')
+
 %description
 Small libc for building embedded applications.
 
@@ -19,15 +31,15 @@ Small libc for building embedded applications.
 Niewielka libc do budowania aplikacji wbudowanych.
 
 %description -l pt_BR
-A diet libc e' uma libc otimizada para criar pequenos binários estaticamente
-linkados para Linux%package devel.
+A diet libc e' uma libc otimizada para criar pequenos binários
+estaticamente linkados para Linux.
 
 %package devel
 Summary:       Development files for dietlibc
 Summary(pl):   Pliki dla programistów u¿ywaj±cych dietlibc
-Summary(pt_BR): libc pequena otimizada para tamanho
+Summary(pt_BR):        libc pequena otimizada para tamanho
 Group:         Development/Libraries
-Requires:      %{name} = %{version}
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
 Small libc for building embedded applications - development files.
@@ -40,7 +52,7 @@ programist
 Summary:       Static libraries for dietlibc
 Summary(pl):   Biblioteki statyczne dla dietlibc
 Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}
+Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Small libc for building embedded applications - static libraries.
@@ -50,51 +62,70 @@ Niewielka libc do budowania aplikacji wbudowanych - biblioteki
 statyczne.
 
 %prep
-%setup -q 
-%patch -p1
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+# shouldn't be needed
+#%patch3 -p1
 
 %build
-%define dietprefix %{_prefix}/%{_arch}-linux-dietlibc
-%{__make} prefix=%{dietprefix} all dyn
+export OPTFLAGS="%{rpmcflags}%{?with_ssp: -fno-stack-protector} -fno-strict-aliasing"
+%ifarch sparc sparcv9
+sparc32 \
+%endif
+%{__make} all \
+       prefix=%{dietprefix} \
+       CC="%{__cc}"
+%ifarch %{ix86}
+%{__make} dyn \
+       prefix=%{dietprefix} \
+       CC="%{__cc}"
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man1}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT prefix=%{dietprefix}
+%ifarch sparc sparcv9
+sparc32 \
+%endif
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       prefix=%{dietprefix}
 
 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
 
-cat > $RPM_BUILD_ROOT%{_bindir}/%{_arch}-dietlibc-gcc <<EOF
+cat > $RPM_BUILD_ROOT%{_bindir}/%{_target_cpu}-dietlibc-gcc <<EOF
 #!/bin/sh
 exec %{_bindir}/diet gcc "\$@"
 EOF
 
 rm -rf $RPM_BUILD_ROOT%{dietprefix}/include/{asm,linux}
 
-gzip -9nf TODO README THANKS CAVEAT CHANGES FAQ BUGS AUTHOR
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc *.gz
+%doc AUTHOR BUGS CAVEAT CHANGES FAQ README THANKS TODO
 %dir %{dietprefix}
-%dir %{dietprefix}/lib-%{_arch}
-%attr(755,root,root) %{dietprefix}/lib-%{_arch}/*.so
+%dir %{dietprefix}/lib-%{libarch}
+%ifarch %{ix86}
+%attr(755,root,root) %{dietprefix}/lib-%{libarch}/*.so
 %{_sysconfdir}/*
+%endif
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/*
 %{dietprefix}/include
-%attr(755,root,root) %{dietprefix}/lib-%{_arch}/*.o
+%attr(755,root,root) %{dietprefix}/lib-%{libarch}/*.o
 %{_mandir}/man*/*
 
 %files static
 %defattr(644,root,root,755)
-%{dietprefix}/lib-%{_arch}/*.a
+%{dietprefix}/lib-%{libarch}/*.a