up to 0.34 (rel 0.1 memalign patch needs update)

[packages/dietlibc.git] / dietlibc.spec

diff --git a/dietlibc.spec b/dietlibc.spec
index cee5767d8fab7e858eaaadfed24084ba43949336..9b00464c9e19f7eeb4e8ce3f0a8904a9d014f5da 100644 (file)
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -1,7 +1,6 @@
-#
 # Conditional build:
 %bcond_without ssp     # stack-smashing protector
-%bcond_without dynamic # dynamic lib support
+%bcond_with    dynamic # dynamic lib support
 
 %ifnarch %{ix86} %{x8664} arm
 %undefine      with_dynamic
@@ -11,33 +10,27 @@ 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.33
-Release:       1
+Version:       0.34
+Release:       0.1
 Epoch:         2
 License:       GPL v2
 Group:         Development/Libraries
-Source0:       http://www.fefe.de/dietlibc/%{name}-%{version}.tar.bz2
-# Source0-md5: 9d541b9a6623b04ec12e5248b82db7c0
+Source0:       http://www.fefe.de/dietlibc/%{name}-%{version}.tar.xz
+# Source0-md5: 4f04a6f642548cc5be716a6e0de6b631
 Patch0:                %{name}-ppc.patch
 Patch1:                %{name}-opt.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}-dynamic.patch
-Patch13:       %{name}-strcoll.patch
-Patch14:       umount-arch.patch
-Patch15:       %{name}-memalign.patch
-Patch16:       %{name}-getsubopt.patch
-Patch17:       %{name}-devmacros.patch
-Patch19:       %{name}-notify.patch
+Patch3:                %{name}-guard.patch
+Patch4:                %{name}-arm.patch
+Patch5:                %{name}-diet-m.patch
+Patch6:                %{name}-nostrip.patch
+Patch7:                %{name}-stackgap-instead-of-ssp.patch
+Patch9:                %{name}-memalign.patch
+Patch10:       %{name}-getsubopt.patch
+Patch11:       %{name}-devmacros.patch
+Patch12:       %{name}-notify.patch
+Patch13:       x32-fixes.patch
+Patch14:       %{name}-no-vsyscall.patch
 URL:           http://www.fefe.de/dietlibc/
 BuildRequires: rpmbuild(macros) >= 1.566
 BuildRequires: sed >= 4.0
@@ -113,26 +106,18 @@ statyczne.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%{!?with_ssp:%patch9 -p1}
+%{!?with_ssp:%patch7 -p1}
+%patch9 -p1
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch19 -p1
 
 %if "%{cc_version}" < "3.4"
 %{__sed} -i -e '/CFLAGS/ s/-Wextra//' Makefile
 %endif
 
-# there is unconditional nice.c already; __nice.c breaks x86_64 build
-%{__rm} lib/__nice.c
-
 %build
 export OPTFLAGS="%{rpmcflags}%{?with_ssp: -fno-stack-protector} -fno-strict-aliasing -Wa,--noexecstack"
 CC="%{__cc}"
@@ -140,12 +125,18 @@ CC="%{__cc}"
 sparc32 \
 %endif
 %{__make} -j1 all \
+%ifarch x32
+       MYARCH=x32 \
+%endif
        prefix=%{dietprefix} \
        CC="${CC#*ccache }"
 
 %if %{with dynamic}
 # 'dyn' target is not SMP safe
 %{__make} -j1 dyn \
+%ifarch x32
+       MYARCH=x32 \
+%endif
        prefix=%{dietprefix} \
        CC="${CC}"
 %endif
@@ -158,6 +149,9 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man1}
 sparc32 \
 %endif
 %{__make} install \
+%ifarch x32
+       MYARCH=x32 \
+%endif
        DESTDIR=$RPM_BUILD_ROOT \
        prefix=%{dietprefix}