From f74912ae5381f27c76fa9039441ac4f735e73a31 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 6 Jul 2005 08:38:05 +0000 Subject: 2005-07-06 Ralf Corsepius * binutils/binutils.add: Take out -D_FORTIFY_SOURCE from CFLAGS to prevent fortify from rendering ar unusable. --- scripts/ChangeLog | 5 +++++ scripts/binutils/binutils.add | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/scripts/ChangeLog b/scripts/ChangeLog index 2be1252a3a..ae7944c982 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,8 @@ +2005-07-06 Ralf Corsepius + + * binutils/binutils.add: Take out -D_FORTIFY_SOURCE from CFLAGS + to prevent fortify from rendering ar unusable. + 2005-07-05 Ralf Corsepius * binutils/mkspec.in, gccnewlib/mkspec.in, gdb/mkspec.in: diff --git a/scripts/binutils/binutils.add b/scripts/binutils/binutils.add index 3fbfd99bb3..21674dcabe 100644 --- a/scripts/binutils/binutils.add +++ b/scripts/binutils/binutils.add @@ -47,7 +47,13 @@ cd .. %build cd build - CFLAGS="$RPM_OPT_FLAGS" \ +%if "%{binutils_version}" <= "2.16.1" +# ar leaks memory - Disable fortify to prevent it from killing ar + OPT_FLAGS=$(echo "$RPM_OPT_FLAGS" | sed -e 's/\-Wp,\-D_FORTIFY_SOURCE=[^ ]*//') +%else + OPT_FLAGS="$RPM_OPT_FLAGS" +%endif + CFLAGS="$OPT_FLAGS" \ ../binutils-%{binutils_version}/configure \ --build=%_build --host=%_host \ --target=%{binutils_target} \ -- cgit v1.2.3