[PATCH] perf tools: Fix feature check for libdw dwarf unwind

[PATCH] perf tools: Fix feature check for libdw dwarf unwind

[Josh Boyer]

When the feature check for libdw dwarf unwind support was added with commit
45757895c7, it required LIBDW_DIR to be set before it would work.  However,
commit 0a4f2b6a3ba implies that the libdw unwinder should be auto-detected
from the installed libraries and not require LIBDW_DIR to be set.

The feature check is failing because FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind
is only being set when LIBDW_DIR is specified.  This causes the feature test
to be built without -ldw, which causes it to fail.  Fix this by moving the
endif for the LIBDW_DIR check up.

Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
---
 tools/perf/config/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index c23418225c2c..d3e3b7a7d979 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -65,10 +65,10 @@ ifndef NO_LIBELF
   ifdef LIBDW_DIR
     LIBDW_CFLAGS  := -I$(LIBDW_DIR)/include
     LIBDW_LDFLAGS := -L$(LIBDW_DIR)/lib
+  endif
 
     FEATURE_CHECK_CFLAGS-libdw-dwarf-unwind := $(LIBDW_CFLAGS)
     FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) -ldw
-  endif
 endif
 
 # include ARCH specific config
-- 
1.8.5.3

Re: [PATCH] perf tools: Fix feature check for libdw dwarf unwind

[Jiri Olsa]

On Thu, Apr 03, 2014 at 08:23:50AM -0400, Josh Boyer wrote:
> When the feature check for libdw dwarf unwind support was added with commit
> 45757895c7, it required LIBDW_DIR to be set before it would work.  However,
> commit 0a4f2b6a3ba implies that the libdw unwinder should be auto-detected
> from the installed libraries and not require LIBDW_DIR to be set.
> 
> The feature check is failing because FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind
> is only being set when LIBDW_DIR is specified.  This causes the feature test
> to be built without -ldw, which causes it to fail.  Fix this by moving the
> endif for the LIBDW_DIR check up.

hi,
Ramkumar was faster ;-)
http://marc.info/?l=linux-kernel&m=139587378628124&w=2

taking his change

thanks,
jirka

> 
> Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
> ---
>  tools/perf/config/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
> index c23418225c2c..d3e3b7a7d979 100644
> --- a/tools/perf/config/Makefile
> +++ b/tools/perf/config/Makefile
> @@ -65,10 +65,10 @@ ifndef NO_LIBELF
>    ifdef LIBDW_DIR
>      LIBDW_CFLAGS  := -I$(LIBDW_DIR)/include
>      LIBDW_LDFLAGS := -L$(LIBDW_DIR)/lib
> +  endif
>  
>      FEATURE_CHECK_CFLAGS-libdw-dwarf-unwind := $(LIBDW_CFLAGS)
>      FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) -ldw
> -  endif
>  endif
>  
>  # include ARCH specific config
> -- 
> 1.8.5.3