[PATCH] tools/perf/Makefile: drop _FORTIFY_SOURCE right before redefinition

[PATCH] tools/perf/Makefile: drop _FORTIFY_SOURCE right before redefinition

[Sergei Trofimovich]

From: Sergei Trofimovich <slyfox@gentoo.org>

Gentoo's toolchain sets _FORTIFY_SOURCE by default
which leads to very obscure error:

perf # make clean && make
Makefile:455: No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev
Makefile:470: *** No gnu/libc-version.h found, please install glibc-dev[el]/glibc-static.  Stop

Patch explicitely undefines _FORTIFY_SOURCE. Thanks!

CC: Peter Zijlstra <a.p.zijlstra@chello.nl>
CC: Paul Mackerras <paulus@samba.org>
CC: Ingo Molnar <mingo@redhat.com>
CC: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
---
 tools/perf/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index 891bc77..60f083d 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -94,7 +94,7 @@ ifeq ("$(origin DEBUG)", "command line")
   PERF_DEBUG = $(DEBUG)
 endif
 ifndef PERF_DEBUG
-  CFLAGS_OPTIMIZE = -O6 -D_FORTIFY_SOURCE=2
+  CFLAGS_OPTIMIZE = -O6 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
 endif
 
 ifdef PARSER_DEBUG
-- 
1.8.0

Re: [PATCH] tools/perf/Makefile: drop _FORTIFY_SOURCE right before redefinition

[Arnaldo Carvalho de Melo]

Em Fri, Feb 22, 2013 at 01:17:54PM +0300, Sergei Trofimovich escreveu:
> From: Sergei Trofimovich <slyfox@gentoo.org>
> 
> Gentoo's toolchain sets _FORTIFY_SOURCE by default
> which leads to very obscure error:
> 
> perf # make clean && make
> Makefile:455: No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev
> Makefile:470: *** No gnu/libc-version.h found, please install glibc-dev[el]/glibc-static.  Stop
> 
> Patch explicitely undefines _FORTIFY_SOURCE. Thanks!

There was a fix merged recently related to this define, can you please
check?

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

branch

perf/core

This patch:

http://git.kernel.org/?p=linux/kernel/git/acme/linux.git;a=commitdiff;h=1807606ac70da5cda870362c13e71d60e94f9c13

- Arnaldo

Re: [PATCH] tools/perf/Makefile: drop _FORTIFY_SOURCE right before redefinition

[Sergei Trofimovich]

[-- Attachment #1: Type: text/plain, Size: 1081 bytes --]

On Fri, 22 Feb 2013 12:08:14 -0300
Arnaldo Carvalho de Melo <acme@ghostprotocols.net> wrote:

> Em Fri, Feb 22, 2013 at 01:17:54PM +0300, Sergei Trofimovich escreveu:
> > From: Sergei Trofimovich <slyfox@gentoo.org>
> > 
> > Gentoo's toolchain sets _FORTIFY_SOURCE by default
> > which leads to very obscure error:
> > 
> > perf # make clean && make
> > Makefile:455: No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev
> > Makefile:470: *** No gnu/libc-version.h found, please install glibc-dev[el]/glibc-static.  Stop
> > 
> > Patch explicitely undefines _FORTIFY_SOURCE. Thanks!
> 
> There was a fix merged recently related to this define, can you please
> check?
> 
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux
> 
> branch
> 
> perf/core
> 
> This patch:
> 
> http://git.kernel.org/?p=linux/kernel/git/acme/linux.git;a=commitdiff;h=1807606ac70da5cda870362c13e71d60e94f9c13
> 
> - Arnaldo

Yeah, works fine as well. Thank you!

-- 

  Sergei

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 198 bytes --]