- up to 0.30

[packages/dietlibc.git] / dietlibc.spec

diff --git a/dietlibc.spec b/dietlibc.spec
index 7c2d577e71df590190c8c35f0e1c1ebbd91570c9..2a1d656e8023d22715071997cea603adbec65d1d 100644 (file)
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -1,32 +1,28 @@
-%bcond_with    pp      # disable stack protector 'coz dietlibc will not work with it!
-
+#
+# 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
 Name:          dietlibc
-Version:       0.25
+Version:       0.30
 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: a24c99d65b7443d17d0b15b74a1b39a0
-Source1:       %{name}-divrem.m4
+# Source0-md5: 2465d652fff6f1fad3da3b98e60e83c9
 Patch0:                %{name}-ppc.patch
 Patch1:                %{name}-opt.patch
-Patch2:                %{name}-athlon.patch
-Patch3:                %{name}-amd64.patch
-Patch4:                %{name}-pentiumX.patch
+Patch2:                %{name}-platform.patch
+Patch3:                %{name}-gcc4.patch
 URL:           http://www.fefe.de/dietlibc/
-%ifarch sparc
-BuildRequires: m4
-BuildRequires: perl-base
-%endif
 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\\|pentium3\\|athlon/i386/;s/amd64/x86_64/')
+%define                libarch         %(echo %{_target_cpu} | sed -e 's/i.86\\|pentium.\\|athlon/i386/;s/amd64/x86_64/')
 
 %description
 Small libc for building embedded applications.
@@ -70,26 +66,21 @@ statyczne.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-
-%ifarch sparc
-# generate missing functions
-(echo "define(NAME,\`.div')define(OP,\`div')define(S,\`true')"; cat %{SOURCE1}) \
-       | m4 > sparc/sdiv.S
-(echo "define(NAME,\`.rem')define(OP,\`rem')define(S,\`true')"; cat %{SOURCE1}) \
-       | m4 > sparc/srem.S
-%{__perl} -pi -e 's@(^LIBOBJ.*$)@$1 \$(OBJDIR)/sdiv.o \$(OBJDIR)/srem.o@' sparc/Makefile.add
-%endif
+# shouldn't be needed
+#%patch3 -p1
 
 %build
-OPTFLAGS="%{rpmcflags} %{?with_pp:-fno-stack-protector}"; export OPTFLAGS
+export OPTFLAGS="%{rpmcflags}%{?with_ssp: -fno-stack-protector} -fno-strict-aliasing"
 %ifarch sparc sparcv9
 sparc32 \
 %endif
-%{__make} prefix=%{dietprefix} all
+%{__make} all \
+       prefix=%{dietprefix} \
+       CC="%{__cc}"
 %ifarch %{ix86}
-%{__make} prefix=%{dietprefix} dyn
+%{__make} dyn \
+       prefix=%{dietprefix} \
+       CC="%{__cc}"
 %endif
 
 %install
@@ -120,7 +111,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}