X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=build%2Fexternal%2Fpackages%2Flibbpf.mk;h=39da05d987150e3fa744dc7d27906bc5953b55a3;hb=353575f604324154e1582364918ac10aea12dad4;hp=90ff54b433c153d38a4a8f2aa22b8218a0cd56d4;hpb=4a76d6f6da035220917097bc047b08bc58254803;p=vpp.git

diff --git a/build/external/packages/libbpf.mk b/build/external/packages/libbpf.mk
index 90ff54b433c..39da05d9871 100644
--- a/build/external/packages/libbpf.mk
+++ b/build/external/packages/libbpf.mk
@@ -13,8 +13,9 @@
 
 LIBBPF_DEBUG?=n
 
-libbpf_version             := 0.1.0
+libbpf_version             := 0.2
 libbpf_tarball             := v$(libbpf_version).tar.gz
+libbpf_tarball_md5sum_0.2  := cd0f82d76a9830c1e66b1a249393d5a8
 libbpf_tarball_md5sum_0.1.0 := 00b991a6e2d28d797a56ab1575ed40e1
 libbpf_tarball_md5sum      := $(libbpf_tarball_md5sum_$(libbpf_version))
 libbpf_tarball_strip_dirs  := 1
@@ -27,8 +28,10 @@ else
   LIBBPF_CFLAGS+= -O2
 endif
 
-IF_XDP:=$(shell echo "\#include <linux/if_xdp.h>" | $(CC) -E -xc - > /dev/null 2>&1)
-IF_XDP:=$(.SHELLSTATUS)
+# check for libelf, zlib and kernel if_xdp.h presence
+LIBBPF_DEPS_CHECK:="\#include <linux/if_xdp.h>\\n\#include <gelf.h>\\n\#include <zlib.h>\\nint main(void){return 0;}"
+LIBBPF_DEPS_CHECK:=$(shell echo -e $(LIBBPF_DEPS_CHECK) | $(CC) -xc -lelf -lz -o /dev/null - > /dev/null 2>&1)
+LIBBPF_DEPS_CHECK:=$(.SHELLSTATUS)
 
 define  libbpf_config_cmds
 	@true
@@ -46,8 +49,8 @@ define  libbpf_install_cmds
 	$(call libbpf_build_cmds__,install,$(libbpf_install_log))
 endef
 
-ifneq ($(IF_XDP),0)
-  $(warning "linux/if_xdp.h was not found on this system. libbpf will be skipped.")
+ifneq ($(LIBBPF_DEPS_CHECK),0)
+  $(warning "Missing libbpf dependencies. libbpf will be skipped.")
 libbpf-install:
 	@true
 else