always pass MYARCH explicitly

[packages/dietlibc.git] / dietlibc.spec

diff --git a/dietlibc.spec b/dietlibc.spec
index ec6e338a867e8f2b142414bd65a8d7755c0ba622..4c41eb4af88e8636174c198d2ca92dfd19f1d18c 100644 (file)
--- a/dietlibc.spec
+++ b/dietlibc.spec
@@ -1,7 +1,6 @@
-#
 # Conditional build:
-%bcond_with    ssp     # disable stack-smashing protector 'coz dietlibc will not work with it!
-%bcond_without dynamic # dynamic lib support
+%bcond_without ssp     # stack-smashing protector
+%bcond_with    dynamic # dynamic lib support
 
 %ifnarch %{ix86} %{x8664} arm
 %undefine      with_dynamic
@@ -11,34 +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.32
-Release:       13
+Version:       0.34
+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.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}-noexecstacks.patch
-Patch13:       %{name}-strcoll.patch
-Patch15:       %{name}-memalign.patch
-Patch16:       %{name}-getsubopt.patch
-Patch17:       %{name}-devmacros.patch
-Patch18:       %{name}-bloat.patch
-Patch19:       %{name}-notify.patch
-Patch20:       %{name}-loop.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
@@ -114,37 +106,33 @@ 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
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p0
-%patch19 -p1
-%patch20 -p1
+%patch14 -p1
 
 %if "%{cc_version}" < "3.4"
 %{__sed} -i -e '/CFLAGS/ s/-Wextra//' Makefile
 %endif
 
 %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 \
 %endif
 %{__make} -j1 all \
+       MYARCH=%{libarch} \
        prefix=%{dietprefix} \
        CC="${CC#*ccache }"
 
 %if %{with dynamic}
 # 'dyn' target is not SMP safe
 %{__make} -j1 dyn \
+       MYARCH=%{libarch} \
        prefix=%{dietprefix} \
        CC="${CC}"
 %endif
@@ -157,6 +145,7 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man1}
 sparc32 \
 %endif
 %{__make} install \
+       MYARCH=%{libarch} \
        DESTDIR=$RPM_BUILD_ROOT \
        prefix=%{dietprefix}