- rel 2

[packages/dietlibc.git] / dietlibc.spec

diff --git a/dietlibc.spec b/dietlibc.spec
index 355a9ab6337656d1ddd1a203e346da02d4aa7661..e82215e2259add625db27aa138d7903ac193a4bb 100644 (file)
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -3,68 +3,75 @@
 %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(pl.UTF-8):     Biblioteka standardowa C zoptymalizowana na rozmiar
+Summary(pt_BR.UTF-8):  libc pequena otimizada para tamanho
 Name:          dietlibc
-Version:       0.29
-Release:       1
+Version:       0.31
+Release:       2
 Epoch:         2
 License:       GPL v2
 Group:         Development/Libraries
 Source0:       http://www.kernel.org/pub/linux/libs/dietlibc/%{name}-%{version}.tar.bz2
-# Source0-md5: 16d31dd7b5f9124e8ea8280c3f646e13
-Source1:       %{name}-divrem.m4
+# Source0-md5: acb98d469ee932d902fdf6de07802b7c
 Patch0:                %{name}-ppc.patch
 Patch1:                %{name}-opt.patch
-Patch2:                %{name}-athlon.patch
-Patch3:                %{name}-amd64.patch
-Patch4:                %{name}-pentiumX.patch
-Patch5:                %{name}-gcc4.patch
+Patch2:                %{name}-platform.patch
+# workaround for http://gcc.gnu.org/PR26374
+Patch3:                %{name}-gcc4.patch
+Patch4:                %{name}-guard.patch
+Patch5:                %{name}-arm.patch
+Patch6:                %{name}-diet-m.patch
+Patch7:                %{name}-nice.patch
+Patch8:                %{name}-nostrip.patch
+Patch9:                %{name}-stackgap-instead-of-ssp.patch
+Patch10:       %{name}-fflush-null.patch
+Patch11:       %{name}-_syscall-no-arch.patch
+Patch12:       %{name}-noexecstacks.patch
+Patch13:       %{name}-strcoll.patch
 URL:           http://www.fefe.de/dietlibc/
-%ifarch sparc
-BuildRequires: m4
-BuildRequires: perl-base
+%ifarch sparc sparcv9
+BuildRequires: sparc32
 %endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                dietprefix      %{_prefix}/%{_target_cpu}-linux-dietlibc
+%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/')
+%define                libarch         %(echo %{_target_cpu} | sed -e 's/i.86\\|pentium.\\|athlon/i386/;s/amd64/x86_64/;s/armv.*/arm/')
 
 %description
 Small libc for building embedded applications.
 
-%description -l pl
+%description -l pl.UTF-8
 Niewielka libc do budowania aplikacji wbudowanych.
 
-%description -l pt_BR
-A diet libc e' uma libc otimizada para criar pequenos binários
+%description -l pt_BR.UTF-8
+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(pl.UTF-8):     Pliki dla programistów używających dietlibc
+Summary(pt_BR.UTF-8):  libc pequena otimizada para tamanho
 Group:         Development/Libraries
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description devel
 Small libc for building embedded applications - development files.
 
-%description devel -l pl
+%description devel -l pl.UTF-8
 Niewielka libc do budowania aplikacji wbudowanych - pliki dla
-programistów.
+programistów.
 
 %package static
 Summary:       Static libraries for dietlibc
-Summary(pl):   Biblioteki statyczne dla dietlibc
+Summary(pl.UTF-8):     Biblioteki statyczne dla dietlibc
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Small libc for building embedded applications - static libraries.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Niewielka libc do budowania aplikacji wbudowanych - biblioteki
 statyczne.
 
@@ -76,15 +83,14 @@ statyczne.
 %patch3 -p1
 %patch4 -p1
 %patch5 -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
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%{!?with_ssp:%patch9 -p1}
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 %build
 export OPTFLAGS="%{rpmcflags}%{?with_ssp: -fno-stack-protector} -fno-strict-aliasing"
@@ -92,10 +98,12 @@ export OPTFLAGS="%{rpmcflags}%{?with_ssp: -fno-stack-protector} -fno-strict-alia
 sparc32 \
 %endif
 %{__make} all \
-       prefix=%{dietprefix}
+       prefix=%{dietprefix} \
+       CC="%{__cc}"
 %ifarch %{ix86}
 %{__make} dyn \
-       prefix=%{dietprefix}
+       prefix=%{dietprefix} \
+       CC="%{__cc}"
 %endif
 
 %install