- more dynamic fixes (x86_64 builds now)

[packages/dietlibc.git] / dietlibc.spec

diff --git a/dietlibc.spec b/dietlibc.spec
index dcc4fe34fa1aacdb11350e05bf6255e146f75922..cee5767d8fab7e858eaaadfed24084ba43949336 100644 (file)
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_with    ssp     # disable stack-smashing protector 'coz dietlibc will not work with it!
+%bcond_without ssp     # stack-smashing protector
 %bcond_without dynamic # dynamic lib support
 
 %ifnarch %{ix86} %{x8664} arm
@@ -11,13 +11,13 @@ 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.32
-Release:       8
+Version:       0.33
+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: 0098761c17924c15e21d25acdda4a8b5
+Source0:       http://www.fefe.de/dietlibc/%{name}-%{version}.tar.bz2
+# Source0-md5: 9d541b9a6623b04ec12e5248b82db7c0
 Patch0:                %{name}-ppc.patch
 Patch1:                %{name}-opt.patch
 Patch2:                %{name}-platform.patch
@@ -31,12 +31,12 @@ 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
+Patch12:       %{name}-dynamic.patch
 Patch13:       %{name}-strcoll.patch
+Patch14:       umount-arch.patch
 Patch15:       %{name}-memalign.patch
 Patch16:       %{name}-getsubopt.patch
 Patch17:       %{name}-devmacros.patch
-Patch18:       %{name}-bloat.patch
 Patch19:       %{name}-notify.patch
 URL:           http://www.fefe.de/dietlibc/
 BuildRequires: rpmbuild(macros) >= 1.566
@@ -120,18 +120,21 @@ statyczne.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
-%patch18 -p0
 %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"
+export OPTFLAGS="%{rpmcflags}%{?with_ssp: -fno-stack-protector} -fno-strict-aliasing -Wa,--noexecstack"
 CC="%{__cc}"
 %ifarch sparc sparcv9
 sparc32 \