From aa59dfc6dfcb3a52a1f64c97f75b9827261be25b Mon Sep 17 00:00:00 2001 From: Abhishek Vijeev Date: Sat, 15 Aug 2020 13:37:56 +0530 Subject: [PATCH] Set Makefile config variables for libbpf Source files modified: * Makefile.config - Checks whether libbpf is installed on the system. If so, we add -lbpf to LIBS_FEATURES, -DCONFIG_HAS_LIBBPF to FEATURE_DEFINES and set CONFIG_HAS_LIBBPF. This allows us to check for the presence of libbpf before compiling or executing BPF c/r code and ZDTM tests. * Makefile - Set CONFIG_HAS_LIBBPF to clean all files. Signed-off-by: Abhishek Vijeev --- Makefile | 1 + Makefile.config | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/Makefile b/Makefile index e72dd1428..5ac4cbacd 100644 --- a/Makefile +++ b/Makefile @@ -208,6 +208,7 @@ else # To clean all files, enable make/build options here export CONFIG_COMPAT := y export CONFIG_GNUTLS := y +export CONFIG_HAS_LIBBPF := y endif # diff --git a/Makefile.config b/Makefile.config index 98ba5d892..3d99e680b 100644 --- a/Makefile.config +++ b/Makefile.config @@ -15,6 +15,12 @@ ifeq ($(call pkg-config-check,libselinux),y) FEATURE_DEFINES += -DCONFIG_HAS_SELINUX endif +ifeq ($(call pkg-config-check,libbpf),y) + LIBS_FEATURES += -lbpf + FEATURE_DEFINES += -DCONFIG_HAS_LIBBPF + export CONFIG_HAS_LIBBPF := y +endif + ifeq ($(NO_GNUTLS)x$(call pkg-config-check,gnutls),xy) LIBS_FEATURES += -lgnutls export CONFIG_GNUTLS := y