From 899a2daa2ea9a536633d57df389a83ff2950eae2 Mon Sep 17 00:00:00 2001 From: ensc Date: Sat, 1 Sep 2007 13:09:57 +0000 Subject: [PATCH] reenabled '-fno-stack-protector' for non-i386/x86_64 archs --- dietlibc.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dietlibc.spec b/dietlibc.spec index 05d9678..6afc5a2 100644 --- a/dietlibc.spec +++ b/dietlibc.spec @@ -35,6 +35,7 @@ Source0: http://www.kernel.org/pub/linux/libs/dietlibc/%name-%version.tar.bz2 Source1: http://www.fefe.de/dietlibc/%name-%version.tar.bz2.sig Patch1: dietlibc-0.28-setpriority.patch Patch10: dietlibc-0.29-scall.patch +Patch20: dietlibc-0.29-nostackprotector.patch Patch30: dietlibc-0.30-longdouble.patch Patch31: dietlibc-0.31-defpath.patch Patch32: dietlibc-0.31-stacksmash.patch @@ -73,9 +74,18 @@ This package contains the dynamic libraries for dietlibc. %patch32 -p1 -b .stacksmash %patch33 -p1 -b .stacksmash-dyn +%ifnarch i386 x86_64 +%patch20 -p1 -b .nostackprotector +sed -i -e 's!^#define WANT_SSP$!// \0!g; + s!.*\(#define WANT_STACKGAP\).*!\1!g' dietfeatures.h +%global xtra_fixcflags -fno-stack-protector +%else +%global xtra_fixcflags %nil +%endif + sed -i -e 's!strip !: !g' Makefile -%global fixcflags -fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables -Os +%global fixcflags -fomit-frame-pointer -fno-exceptions -fno-asynchronous-unwind-tables %xtra_fixcflags -Os %global basemakeflags prefix=%_libdir/dietlibc BINDIR=%_bindir MAN1DIR=%_mandir/man1 COMMENT=: CFLAGS="$RPM_OPT_FLAGS %fixcflags" PDIET=%_libdir/dietlibc %global makeflags %basemakeflags