[PATCH] perf tools: Allow to specify lib compile variable for spec usage

[PATCH] perf tools: Allow to specify lib compile variable for spec usage

[Jiri Olsa]

We need a way to specify $(lib) part of the installation
path for traceevent plugin libraries. Currently we use
'lib64' for x86_64 and 'lib' otherwise.

Instead of listing all possible values, this change allows
the rpm spec code to specify the correct $(lib) part based
on processed architecture, like

  $ make ... lib=%{_lib}

Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/perf/config/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 75d4c237b03d..eaf36dafb482 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -651,11 +651,13 @@ else
 sysconfdir = $(prefix)/etc
 ETC_PERFCONFIG = etc/perfconfig
 endif
+ifndef lib
 ifeq ($(IS_X86_64),1)
 lib = lib64
 else
 lib = lib
 endif
+endif # lib
 libdir = $(prefix)/$(lib)
 
 # Shell quote (do not use $(call) to accommodate ancient setups);
-- 
1.8.3.1

Re: [PATCH] perf tools: Allow to specify lib compile variable for spec usage

[Kyle McMartin]

On Mon, Aug 25, 2014 at 10:55 AM, Jiri Olsa <jolsa@kernel.org> wrote:
> We need a way to specify $(lib) part of the installation
> path for traceevent plugin libraries. Currently we use
> 'lib64' for x86_64 and 'lib' otherwise.
>
> Instead of listing all possible values, this change allows
> the rpm spec code to specify the correct $(lib) part based
> on processed architecture, like
>
>   $ make ... lib=%{_lib}
>
> Cc: Kyle McMartin <kyle@mcmartin.ca>

I had made a similar change to Fedora, which I replaced with this, and
it worked fine.
LGTM :)

Tested-by: Kyle McMartin <kyle@mcmartin.ca>

> Cc: Arnaldo Carvalho de Melo <acme@kernel.org>
> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
> Cc: David Ahern <dsahern@gmail.com>
> Cc: Frederic Weisbecker <fweisbec@gmail.com>
> Cc: Ingo Molnar <mingo@kernel.org>
> Cc: Namhyung Kim <namhyung@kernel.org>
> Cc: Paul Mackerras <paulus@samba.org>
> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>
> ---
>  tools/perf/config/Makefile | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
> index 75d4c237b03d..eaf36dafb482 100644
> --- a/tools/perf/config/Makefile
> +++ b/tools/perf/config/Makefile
> @@ -651,11 +651,13 @@ else
>  sysconfdir = $(prefix)/etc
>  ETC_PERFCONFIG = etc/perfconfig
>  endif
> +ifndef lib
>  ifeq ($(IS_X86_64),1)
>  lib = lib64
>  else
>  lib = lib
>  endif
> +endif # lib
>  libdir = $(prefix)/$(lib)
>
>  # Shell quote (do not use $(call) to accommodate ancient setups);
> --
> 1.8.3.1
>

[tip:perf/core] perf tools: Allow to specify lib compile variable for spec usage

[tip-bot for Jiri Olsa]

Commit-ID:  6997af72e6c1e9d8c1cc511dc9485e9ee69a5e20
Gitweb:     http://git.kernel.org/tip/6997af72e6c1e9d8c1cc511dc9485e9ee69a5e20
Author:     Jiri Olsa <jolsa@kernel.org>
AuthorDate: Mon, 25 Aug 2014 16:55:52 +0200
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 17 Sep 2014 17:08:08 -0300

perf tools: Allow to specify lib compile variable for spec usage

We need a way to specify $(lib) part of the installation path for
traceevent plugin libraries. Currently we use 'lib64' for x86_64 and
'lib' otherwise.

Instead of listing all possible values, this change allows the rpm spec
code to specify the correct $(lib) part based on processed architecture,
like

  $ make ... lib=%{_lib}

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Kyle McMartin <kyle@mcmartin.ca>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1408978552-17131-1-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/config/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 98c9fd1..58f6091 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -653,11 +653,13 @@ else
 sysconfdir = $(prefix)/etc
 ETC_PERFCONFIG = etc/perfconfig
 endif
+ifndef lib
 ifeq ($(IS_X86_64),1)
 lib = lib64
 else
 lib = lib
 endif
+endif # lib
 libdir = $(prefix)/$(lib)
 
 # Shell quote (do not use $(call) to accommodate ancient setups);