- merged into common patch.

[packages/dietlibc.git] / dietlibc.spec

diff --git a/dietlibc.spec b/dietlibc.spec
index c58a00d7cd4174038507f067c98258c44fba0cf8..09db13371711582a68b1600ef91d0700148a4bfa 100644 (file)
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -1,22 +1,30 @@
+#
+# 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.22
+Version:       0.29
 Release:       1
 Epoch:         2
 License:       GPL v2
 Group:         Development/Libraries
 Source0:       http://www.kernel.org/pub/linux/libs/dietlibc/%{name}-%{version}.tar.bz2
-# Source0-md5: 877b12ab0b2bbff340095cf2cf074418
+# Source0-md5: 16d31dd7b5f9124e8ea8280c3f646e13
 Patch0:                %{name}-ppc.patch
 Patch1:                %{name}-opt.patch
+Patch2:                %{name}-athlon.patch
+Patch3:                %{name}-amd64.patch
+Patch4:                %{name}-pentiumX.patch
+Patch5:                %{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\\|athlon/i386/')
+%define                libarch         %(echo %{_target_cpu} | sed -e 's/i.86\\|pentium.\\|athlon/i386/;s/amd64/x86_64/')
 
 %description
 Small libc for building embedded applications.
@@ -31,9 +39,9 @@ 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.
@@ -46,7 +54,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.
@@ -56,25 +64,36 @@ Niewielka libc do budowania aplikacji wbudowanych - biblioteki
 statyczne.
 
 %prep
-%setup -q 
+%setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
-OPTFLAGS="%{rpmcflags}"; export OPTFLAGS
-%ifarch sparc sparcv9 
+export OPTFLAGS="%{rpmcflags}%{?with_ssp: -fno-stack-protector} -fno-strict-aliasing"
+%ifarch sparc sparcv9
 sparc32 \
 %endif
-%{__make} prefix=%{dietprefix} all
+%{__make} all \
+       prefix=%{dietprefix}
 %ifarch %{ix86}
-%{__make} prefix=%{dietprefix} dyn
+%{__make} dyn \
+       prefix=%{dietprefix}
 %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
@@ -93,7 +112,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc TODO README THANKS CAVEAT CHANGES FAQ BUGS AUTHOR
+%doc AUTHOR BUGS CAVEAT CHANGES FAQ README THANKS TODO
 %dir %{dietprefix}
 %dir %{dietprefix}/lib-%{libarch}
 %ifarch %{ix86}