From: Hilko Bengen <bengen@debian.org>
Date: Tue, 23 Jul 2019 12:43:21 +0000 (+0200)
Subject: Add --with-ebpf-includes parameter
X-Git-Tag: archive/raspbian/1%6.0.5-3+rpi1^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fa0b750529d71545add933415155a276b2325971;p=suricata.git

Add --with-ebpf-includes parameter


Gbp-Pq: Name with-ebpf-includes.patch
---

diff --git a/configure.ac b/configure.ac
index c5fe251e..e190d6ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -509,6 +509,10 @@
                     AC_SUBST(LLC)
                   ],
                   [AC_MSG_ERROR([clang needed to build ebpf files])])
+            AC_ARG_WITH(ebpf_includes,
+                    [  --with-ebpf-includes=DIR  include directory for building eBPF programs],
+                    [AC_SUBST([ebpf_includes],["$withval"])],
+                    [AC_SUBST([ebpf_includes],["/usr/include/${build_alias}"])])
           ])
 
   # enable debug output
diff --git a/ebpf/Makefile.am b/ebpf/Makefile.am
index ad32efd3..f7d21ef2 100644
--- a/ebpf/Makefile.am
+++ b/ebpf/Makefile.am
@@ -4,7 +4,7 @@ EXTRA_DIST= include bypass_filter.c filter.c lb.c vlan_filter.c xdp_filter.c \
 if BUILD_EBPF
 
 # Maintaining a local copy of UAPI linux/bpf.h
-BPF_CFLAGS = -Iinclude
+BPF_CFLAGS = -Iinclude -I$(ebpf_includes)
 
 BPF_TARGETS  = lb.bpf
 BPF_TARGETS += filter.bpf
@@ -19,7 +19,6 @@ all: $(BPF_TARGETS)
 $(BPF_TARGETS): %.bpf: %.c
 #      From C-code to LLVM-IR format suffix .ll (clang -S -emit-llvm)
 	${CLANG} -Wall $(BPF_CFLAGS) -O2 \
-		-I/usr/include/$(build_cpu)-$(build_os)/ \
 		-D__KERNEL__ -D__ASM_SYSREG_H \
 		-target bpf -S -emit-llvm $< -o ${@:.bpf=.ll}
 #      From LLVM-IR to BPF-bytecode in ELF-obj file