[PATCH bpf-next 1/2] tools/latency-collector: Check pkg-config install

[PATCH bpf-next 1/2] tools/latency-collector: Check pkg-config install

[Tao Chen]

The tool pkg-config used to check libtraceevent and libtracefs, if not
installed, it will report the libs not found, even though they have
already been installed.

Before:
libtraceevent is missing. Please install libtraceevent-dev/libtraceevent-devel
libtracefs is missing. Please install libtracefs-dev/libtracefs-devel

After:
Makefile.config:10: *** Error: pkg-config needed by libtraceevent/libtracefs is missing
on this system, please install it.

Fixes: 9d56c88e5225 ("tools/tracing: Use tools/build makefiles on latency-collector")
Signed-off-by: Tao Chen <chen.dylane@linux.dev>
---
 tools/tracing/latency/Makefile.config | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/tracing/latency/Makefile.config b/tools/tracing/latency/Makefile.config
index 0fe6b50f029b..6efa13e3ca93 100644
--- a/tools/tracing/latency/Makefile.config
+++ b/tools/tracing/latency/Makefile.config
@@ -1,7 +1,15 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+include $(srctree)/tools/scripts/utilities.mak
+
 STOP_ERROR :=
 
+ifndef ($(NO_LIBTRACEEVENT),1)
+  ifeq ($(call get-executable,$(PKG_CONFIG)),)
+    $(error Error: $(PKG_CONFIG) needed by libtraceevent/libtracefs is missing on this system, please install it)
+  endif
+endif
+
 define lib_setup
   $(eval LIB_INCLUDES += $(shell sh -c "$(PKG_CONFIG) --cflags lib$(1)"))
   $(eval LDFLAGS += $(shell sh -c "$(PKG_CONFIG) --libs-only-L lib$(1)"))
-- 
2.48.1

[PATCH bpf-next 2/2] rtla: Check pkg-config install

[Tao Chen]

The tool pkg-config used to check libtraceevent and libtracefs, if not
installed, it will report the libs not found, even though they have
already been installed.

Before:
libtraceevent is missing. Please install libtraceevent-dev/libtraceevent-devel
libtracefs is missing. Please install libtracefs-dev/libtracefs-devel

After:
Makefile.config:10: *** Error: pkg-config needed by libtraceevent/libtracefs is missing
on this system, please install it.

Fixes: 01474dc706ca ("tools/rtla: Use tools/build makefiles to build rtla")
Signed-off-by: Tao Chen <chen.dylane@linux.dev>
---
 tools/tracing/rtla/Makefile.config | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tools/tracing/rtla/Makefile.config b/tools/tracing/rtla/Makefile.config
index 5f2231d8d626..07ff5e8f3006 100644
--- a/tools/tracing/rtla/Makefile.config
+++ b/tools/tracing/rtla/Makefile.config
@@ -1,10 +1,18 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
+include $(srctree)/tools/scripts/utilities.mak
+
 STOP_ERROR :=
 
 LIBTRACEEVENT_MIN_VERSION = 1.5
 LIBTRACEFS_MIN_VERSION = 1.6
 
+ifndef ($(NO_LIBTRACEEVENT),1)
+  ifeq ($(call get-executable,$(PKG_CONFIG)),)
+    $(error Error: $(PKG_CONFIG) needed by libtraceevent/libtracefs is missing on this system, please install it)
+  endif
+endif
+
 define lib_setup
   $(eval LIB_INCLUDES += $(shell sh -c "$(PKG_CONFIG) --cflags lib$(1)"))
   $(eval LDFLAGS += $(shell sh -c "$(PKG_CONFIG) --libs-only-L lib$(1)"))
-- 
2.48.1

Re: [PATCH bpf-next 1/2] tools/latency-collector: Check pkg-config install

[Tao Chen]

在 2025/7/30 19:30, Tao Chen 写道:

The branch tag is wrong, i have resent it, sorry for the noise.

> The tool pkg-config used to check libtraceevent and libtracefs, if not
> installed, it will report the libs not found, even though they have
> already been installed.
> 
> Before:
> libtraceevent is missing. Please install libtraceevent-dev/libtraceevent-devel
> libtracefs is missing. Please install libtracefs-dev/libtracefs-devel
> 
> After:
> Makefile.config:10: *** Error: pkg-config needed by libtraceevent/libtracefs is missing
> on this system, please install it.
> 
> Fixes: 9d56c88e5225 ("tools/tracing: Use tools/build makefiles on latency-collector")
> Signed-off-by: Tao Chen <chen.dylane@linux.dev>
> ---
>   tools/tracing/latency/Makefile.config | 8 ++++++++
>   1 file changed, 8 insertions(+)
> 
> diff --git a/tools/tracing/latency/Makefile.config b/tools/tracing/latency/Makefile.config
> index 0fe6b50f029b..6efa13e3ca93 100644
> --- a/tools/tracing/latency/Makefile.config
> +++ b/tools/tracing/latency/Makefile.config
> @@ -1,7 +1,15 @@
>   # SPDX-License-Identifier: GPL-2.0-only
>   
> +include $(srctree)/tools/scripts/utilities.mak
> +
>   STOP_ERROR :=
>   
> +ifndef ($(NO_LIBTRACEEVENT),1)
> +  ifeq ($(call get-executable,$(PKG_CONFIG)),)
> +    $(error Error: $(PKG_CONFIG) needed by libtraceevent/libtracefs is missing on this system, please install it)
> +  endif
> +endif
> +
>   define lib_setup
>     $(eval LIB_INCLUDES += $(shell sh -c "$(PKG_CONFIG) --cflags lib$(1)"))
>     $(eval LDFLAGS += $(shell sh -c "$(PKG_CONFIG) --libs-only-L lib$(1)"))
-- 
Best Regards
Tao Chen