Skip to content

Commit e4b19e2

Browse files
captain5050namhyung
authored andcommitted
perf python: Clean up build dependencies
The python build now depends on libraries and doesn't use python-ext-sources except for the util/python.c dependency. Switch to just directly depending on that file and util/setup.py. This allows the removal of python-ext-sources. Signed-off-by: Ian Rogers <[email protected]> Reviewed-by: James Clark <[email protected]> Cc: Suzuki K Poulose <[email protected]> Cc: Kees Cook <[email protected]> Cc: Palmer Dabbelt <[email protected]> Cc: Albert Ou <[email protected]> Cc: Nick Terrell <[email protected]> Cc: Gary Guo <[email protected]> Cc: Alex Gaynor <[email protected]> Cc: Boqun Feng <[email protected]> Cc: Wedson Almeida Filho <[email protected]> Cc: Ze Gao <[email protected]> Cc: Alice Ryhl <[email protected]> Cc: Andrei Vagin <[email protected]> Cc: Yicong Yang <[email protected]> Cc: Jonathan Cameron <[email protected]> Cc: Guo Ren <[email protected]> Cc: Miguel Ojeda <[email protected]> Cc: Will Deacon <[email protected]> Cc: Mike Leach <[email protected]> Cc: Leo Yan <[email protected]> Cc: Oliver Upton <[email protected]> Cc: John Garry <[email protected]> Cc: Benno Lossin <[email protected]> Cc: Björn Roy Baron <[email protected]> Cc: Andreas Hindborg <[email protected]> Cc: Paul Walmsley <[email protected]> Signed-off-by: Namhyung Kim <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 9dabf40 commit e4b19e2

File tree

2 files changed

+1
-62
lines changed

2 files changed

+1
-62
lines changed

tools/perf/Makefile.perf

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -380,14 +380,6 @@ python-clean := $(call QUIET_CLEAN, python) $(RM) -r $(PYTHON_EXTBUILD) $(OUTPUT
380380
# Use the detected configuration
381381
-include $(OUTPUT).config-detected
382382

383-
ifeq ($(CONFIG_LIBTRACEEVENT),y)
384-
PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources)
385-
else
386-
PYTHON_EXT_SRCS := $(shell grep -v ^\#\\\|util/trace-event.c\\\|util/trace-event-parse.c util/python-ext-sources)
387-
endif
388-
389-
PYTHON_EXT_DEPS := util/python-ext-sources util/setup.py $(LIBAPI)
390-
391383
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH))
392384

393385
PROGRAMS += $(OUTPUT)perf
@@ -715,7 +707,7 @@ all: shell_compatibility_test $(ALL_PROGRAMS) $(LANG_BINDINGS) $(OTHER_PROGRAMS)
715707
# Create python binding output directory if not already present
716708
$(shell [ -d '$(OUTPUT)python' ] || mkdir -p '$(OUTPUT)python')
717709

718-
$(OUTPUT)python/perf$(PYTHON_EXTENSION_SUFFIX): $(PYTHON_EXT_SRCS) $(PYTHON_EXT_DEPS) $(PERFLIBS)
710+
$(OUTPUT)python/perf$(PYTHON_EXTENSION_SUFFIX): util/python.c util/setup.py $(PERFLIBS)
719711
$(QUIET_GEN)LDSHARED="$(CC) -pthread -shared" \
720712
CFLAGS='$(CFLAGS)' LDFLAGS='$(LDFLAGS) $(LIBS)' \
721713
$(PYTHON_WORD) util/setup.py \

tools/perf/util/python-ext-sources

Lines changed: 0 additions & 53 deletions
This file was deleted.

0 commit comments

Comments
 (0)