diff options
| author | Guilherme Amadio <[email protected]> | 2024-06-28 22:34:27 +0200 |
|---|---|---|
| committer | Namhyung Kim <[email protected]> | 2024-07-11 15:08:49 -0700 |
| commit | 1d302f626c2a23e4fd05bb810eff300e8f2174fd (patch) | |
| tree | bc307e1bc453ae12a130b93d643e44959f317bf4 | |
| parent | 608c3b1e612a91fc1b811d2ae6a30ed8dbc7cab7 (diff) | |
perf build: Conditionally add feature check flags for libtrace{event,fs}
This avoids reported warnings when the packages are not installed.
[namhyung]: Removed the dummy assignment and unnecessary ifeq checks.
Fixes: 0f0e1f445690 ("perf build: Use pkg-config for feature check for libtrace{event,fs}")
Signed-off-by: Guilherme Amadio <[email protected]>
Cc: Leo Yan <[email protected]>
Cc: Thorsten Leemhuis <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Namhyung Kim <[email protected]>
| -rw-r--r-- | tools/perf/Makefile.config | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 5271a4c1d2b3..a4829b6532d8 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -182,13 +182,19 @@ endif FEATURE_CHECK_CFLAGS-libzstd := $(LIBZSTD_CFLAGS) FEATURE_CHECK_LDFLAGS-libzstd := $(LIBZSTD_LDFLAGS) +ifneq ($(NO_LIBTRACEEVENT),1) + ifeq ($(call get-executable,$(PKG_CONFIG)),) + $(error Error: $(PKG_CONFIG) needed by libtraceevent is missing on this system, please install it) + endif +endif + # for linking with debug library, run like: # make DEBUG=1 PKG_CONFIG_PATH=/opt/libtraceevent/(lib|lib64)/pkgconfig -FEATURE_CHECK_CFLAGS-libtraceevent := $(shell $(PKG_CONFIG) --cflags libtraceevent) -FEATURE_CHECK_LDFLAGS-libtraceevent := $(shell $(PKG_CONFIG) --libs libtraceevent) +FEATURE_CHECK_CFLAGS-libtraceevent := $(shell $(PKG_CONFIG) --cflags libtraceevent 2>/dev/null) +FEATURE_CHECK_LDFLAGS-libtraceevent := $(shell $(PKG_CONFIG) --libs libtraceevent 2>/dev/null) -FEATURE_CHECK_CFLAGS-libtracefs := $(shell $(PKG_CONFIG) --cflags libtracefs) -FEATURE_CHECK_LDFLAGS-libtracefs := $(shell $(PKG_CONFIG) --libs libtracefs) +FEATURE_CHECK_CFLAGS-libtracefs := $(shell $(PKG_CONFIG) --cflags libtracefs 2>/dev/null) +FEATURE_CHECK_LDFLAGS-libtracefs := $(shell $(PKG_CONFIG) --libs libtracefs 2>/dev/null) FEATURE_CHECK_CFLAGS-bpf = -I. -I$(srctree)/tools/include -I$(srctree)/tools/arch/$(SRCARCH)/include/uapi -I$(srctree)/tools/include/uapi # include ARCH specific config @@ -208,12 +214,6 @@ ifeq ($(call get-executable,$(BISON)),) $(error Error: $(BISON) is missing on this system, please install it) endif -ifneq ($(NO_LIBTRACEEVENT),1) - ifeq ($(call get-executable,$(PKG_CONFIG)),) - dummy := $(error Error: $(PKG_CONFIG) needed by libtraceevent is missing on this system, please install it) - endif -endif - ifneq ($(OUTPUT),) ifeq ($(shell expr $(shell $(BISON) --version | grep bison | sed -e 's/.\+ \([0-9]\+\).\([0-9]\+\).\([0-9]\+\)/\1\2\3/g') \>\= 371), 1) BISON_FILE_PREFIX_MAP := --file-prefix-map=$(OUTPUT)= |