Re: [PATCH] tools/perf: Add includes for detected configs in Makefile.perf
> On 08-Sep-2023, at 4:41 AM, Ian Rogers wrote: > > On Thu, Sep 7, 2023 at 10:19 AM Athira Rajeev > wrote: >> >> Makefile.perf uses "CONFIG_*" checks in the code. Example the config >> for libtraceevent is used to set PYTHON_EXT_SRCS >> >>ifeq ($(CONFIG_LIBTRACEEVENT),y) >> PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources) >>else >> PYTHON_EXT_SRCS := $(shell grep -v '^\#\|util/trace-event.c' >> util/python-ext-sources) >>endif >> >> But this is not picking the value for CONFIG_LIBTRACEEVENT that is >> set using the settings in Makefile.config. Include the file >> ".config-detected" so that make will use the system detected >> configuration in the CONFIG checks. This will fix isues that >> could arise when other "CONFIG_*" checks are added to Makefile.perf >> in future as well. >> >> Signed-off-by: Athira Rajeev >> --- >> tools/perf/Makefile.perf | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf >> index 37af6df7b978..6764b0e156f4 100644 >> --- a/tools/perf/Makefile.perf >> +++ b/tools/perf/Makefile.perf >> @@ -351,6 +351,9 @@ export PYTHON_EXTBUILD_LIB PYTHON_EXTBUILD_TMP >> >> python-clean := $(call QUIET_CLEAN, python) $(RM) -r $(PYTHON_EXTBUILD) >> $(OUTPUT)python/perf*.so >> >> +# Use the detected configuration >> +include .config-detected > > Good catch! I think it should look like: > https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/build/Makefile.build?h=perf-tools-next#n40 > > Thanks, > Ian Thanks for the review Ian. Yes, missed the $(OUTPUT) . Will send a V2 with this change Athira > >> + >> ifeq ($(CONFIG_LIBTRACEEVENT),y) >> PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources) >> else >> -- >> 2.31.1
Re: [PATCH] tools/perf: Add includes for detected configs in Makefile.perf
On Thu, Sep 7, 2023 at 10:19 AM Athira Rajeev wrote: > > Makefile.perf uses "CONFIG_*" checks in the code. Example the config > for libtraceevent is used to set PYTHON_EXT_SRCS > > ifeq ($(CONFIG_LIBTRACEEVENT),y) > PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources) > else > PYTHON_EXT_SRCS := $(shell grep -v '^\#\|util/trace-event.c' > util/python-ext-sources) > endif > > But this is not picking the value for CONFIG_LIBTRACEEVENT that is > set using the settings in Makefile.config. Include the file > ".config-detected" so that make will use the system detected > configuration in the CONFIG checks. This will fix isues that > could arise when other "CONFIG_*" checks are added to Makefile.perf > in future as well. > > Signed-off-by: Athira Rajeev > --- > tools/perf/Makefile.perf | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf > index 37af6df7b978..6764b0e156f4 100644 > --- a/tools/perf/Makefile.perf > +++ b/tools/perf/Makefile.perf > @@ -351,6 +351,9 @@ export PYTHON_EXTBUILD_LIB PYTHON_EXTBUILD_TMP > > python-clean := $(call QUIET_CLEAN, python) $(RM) -r $(PYTHON_EXTBUILD) > $(OUTPUT)python/perf*.so > > +# Use the detected configuration > +include .config-detected Good catch! I think it should look like: https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git/tree/tools/build/Makefile.build?h=perf-tools-next#n40 Thanks, Ian > + > ifeq ($(CONFIG_LIBTRACEEVENT),y) >PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources) > else > -- > 2.31.1 >
[PATCH] tools/perf: Add includes for detected configs in Makefile.perf
Makefile.perf uses "CONFIG_*" checks in the code. Example the config for libtraceevent is used to set PYTHON_EXT_SRCS ifeq ($(CONFIG_LIBTRACEEVENT),y) PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources) else PYTHON_EXT_SRCS := $(shell grep -v '^\#\|util/trace-event.c' util/python-ext-sources) endif But this is not picking the value for CONFIG_LIBTRACEEVENT that is set using the settings in Makefile.config. Include the file ".config-detected" so that make will use the system detected configuration in the CONFIG checks. This will fix isues that could arise when other "CONFIG_*" checks are added to Makefile.perf in future as well. Signed-off-by: Athira Rajeev --- tools/perf/Makefile.perf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 37af6df7b978..6764b0e156f4 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -351,6 +351,9 @@ export PYTHON_EXTBUILD_LIB PYTHON_EXTBUILD_TMP python-clean := $(call QUIET_CLEAN, python) $(RM) -r $(PYTHON_EXTBUILD) $(OUTPUT)python/perf*.so +# Use the detected configuration +include .config-detected + ifeq ($(CONFIG_LIBTRACEEVENT),y) PYTHON_EXT_SRCS := $(shell grep -v ^\# util/python-ext-sources) else -- 2.31.1
