From: Jiri Olsa <jolsa@kernel.org>

Date: Sun, 21 Jul 2019 13:24:12 +0200

Subject: libperf: Add libperf to the python.so build

Git-commit: a429dcb8feb60b8500fed81e2275c1944e3091fc

Patch-mainline: v5.4-rc1

References: jsc#SLE-13661

​

Link libperf.a with python.so.

​

Committer testing:

​

Continues to work:

​

  # perf test python

  18: 'import perf' in python                               : Ok

  #

​

Signed-off-by: Jiri Olsa <jolsa@kernel.org>

Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>

Cc: Alexey Budankov <alexey.budankov@linux.intel.com>

Cc: Andi Kleen <ak@linux.intel.com>

Cc: Michael Petlan <mpetlan@redhat.com>

Cc: Namhyung Kim <namhyung@kernel.org>

Cc: Peter Zijlstra <peterz@infradead.org>

Link: http://lkml.kernel.org/r/20190721112506.12306-26-jolsa@kernel.org

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Signed-off-by: Tony Jones <tonyj@suse.de>

---

 tools/perf/Makefile.perf | 1 +

 tools/perf/util/setup.py | 3 ++-

 2 files changed, 3 insertions(+), 1 deletion(-)

​

diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf

index 6e7e7d44ffac..67512a12276b 100644

--- a/tools/perf/Makefile.perf

+++ b/tools/perf/Makefile.perf

@@ -307,6 +307,7 @@ LIBBPF = $(BPF_PATH)libbpf.a

 LIBSUBCMD = $(SUBCMD_PATH)libsubcmd.a

 LIBPERF = $(LIBPERF_PATH)libperf.a

+export LIBPERF

 # python extension build directories

 PYTHON_EXTBUILD     := $(OUTPUT)python_ext_build/

diff --git a/tools/perf/util/setup.py b/tools/perf/util/setup.py

index a1a68a2fa917..d48f9cd58964 100644

--- a/tools/perf/util/setup.py

+++ b/tools/perf/util/setup.py

@@ -48,6 +48,7 @@ build_lib = getenv('PYTHON_EXTBUILD_LIB')

 build_tmp = getenv('PYTHON_EXTBUILD_TMP')

 libtraceevent = getenv('LIBTRACEEVENT')

 libapikfs = getenv('LIBAPI')

+libperf = getenv('LIBPERF')

 ext_sources = [f.strip() for f in open('util/python-ext-sources')

                if len(f.strip()) > 0 and f[0] != '#']

@@ -64,7 +65,7 @@ perf = Extension('perf',

          include_dirs = ['util/include'],

          libraries = extra_libraries,

          extra_compile_args = cflags,

-         extra_objects = [libtraceevent, libapikfs],

+         extra_objects = [libtraceevent, libapikfs, libperf],

                  )

 setup(name='perf',

​

​