| From bc9e7fe313d5e56d4d5f34bcc04d1165f94f86fb Mon Sep 17 00:00:00 2001 |
| From: James Clark <james.clark@arm.com> |
| Date: Thu, 28 Jul 2022 10:39:46 +0100 |
| Subject: perf python: Fix build when PYTHON_CONFIG is user supplied |
| |
| From: James Clark <james.clark@arm.com> |
| |
| commit bc9e7fe313d5e56d4d5f34bcc04d1165f94f86fb upstream. |
| |
| The previous change to Python autodetection had a small mistake where |
| the auto value was used to determine the Python binary, rather than the |
| user supplied value. The Python binary is only used for one part of the |
| build process, rather than the final linking, so it was producing |
| correct builds in most scenarios, especially when the auto detected |
| value matched what the user wanted, or the system only had a valid set |
| of Pythons. |
| |
| Change it so that the Python binary path is derived from either the |
| PYTHON_CONFIG value or PYTHON value, depending on what is specified by |
| the user. This was the original intention. |
| |
| This error was spotted in a build failure an odd cross compilation |
| environment after commit 4c41cb46a732fe82 ("perf python: Prefer |
| python3") was merged. |
| |
| Fixes: 630af16eee495f58 ("perf tools: Use Python devtools for version autodetection rather than runtime") |
| Signed-off-by: James Clark <james.clark@arm.com> |
| Acked-by: Ian Rogers <irogers@google.com> |
| Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> |
| Cc: Ingo Molnar <mingo@redhat.com> |
| Cc: James Clark <james.clark@arm.com> |
| Cc: Jiri Olsa <jolsa@kernel.org> |
| Cc: Mark Rutland <mark.rutland@arm.com> |
| Cc: Namhyung Kim <namhyung@kernel.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Link: https://lore.kernel.org/r/20220728093946.1337642-1-james.clark@arm.com |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| tools/perf/Makefile.config | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/tools/perf/Makefile.config |
| +++ b/tools/perf/Makefile.config |
| @@ -265,7 +265,7 @@ endif |
| # defined. get-executable-or-default fails with an error if the first argument is supplied but |
| # doesn't exist. |
| override PYTHON_CONFIG := $(call get-executable-or-default,PYTHON_CONFIG,$(PYTHON_AUTO)) |
| -override PYTHON := $(call get-executable-or-default,PYTHON,$(subst -config,,$(PYTHON_AUTO))) |
| +override PYTHON := $(call get-executable-or-default,PYTHON,$(subst -config,,$(PYTHON_CONFIG))) |
| |
| grep-libs = $(filter -l%,$(1)) |
| strip-libs = $(filter-out -l%,$(1)) |
