walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Add LIBBPF_CFLAGS for eBPF program and nghttpx

This commit is contained in:
Tatsuhiro Tsujikawa 2021-08-29 13:58:10 +09:00
parent 1e75be3b5d
commit 8d02203bb6
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bpf/Makefile.am
View File

@ -31,6 +31,7 @@ bpf_pkglib_DATA = reuseport_kern.o
all: $(builddir)/reuseport_kern.o all: $(builddir)/reuseport_kern.o
$(builddir)/reuseport_kern.o: reuseport_kern.c $(builddir)/reuseport_kern.o: reuseport_kern.c
$(CC) @BPFCFLAGS@ @EXTRABPFCFLAGS@ -target bpf -g -c $< -o $@ $(CC) @LIBBPF_CFLAGS@ @BPFCFLAGS@ @EXTRABPFCFLAGS@ \
-target bpf -g -c $< -o $@
endif # HAVE_LIBBPF endif # HAVE_LIBBPF

7
src/Makefile.am
View File

@ -51,6 +51,7 @@ AM_CPPFLAGS = \
@OPENSSL_CFLAGS@ \ @OPENSSL_CFLAGS@ \
@LIBCARES_CFLAGS@ \ @LIBCARES_CFLAGS@ \
@JANSSON_CFLAGS@ \ @JANSSON_CFLAGS@ \
@LIBBPF_CFLAGS@ \
@ZLIB_CFLAGS@ \ @ZLIB_CFLAGS@ \
@EXTRA_DEFS@ \ @EXTRA_DEFS@ \
@DEFS@ @DEFS@
@ -69,6 +70,7 @@ LDADD = $(top_builddir)/lib/libnghttp2.la \
@LIBCARES_LIBS@ \ @LIBCARES_LIBS@ \
@SYSTEMD_LIBS@ \ @SYSTEMD_LIBS@ \
@JANSSON_LIBS@ \ @JANSSON_LIBS@ \
@LIBBPF_LIBS@ \
@ZLIB_LIBS@ \ @ZLIB_LIBS@ \
@APPLDFLAGS@ @APPLDFLAGS@
@ -187,7 +189,7 @@ libnghttpx_a_CPPFLAGS = ${AM_CPPFLAGS}
nghttpx_SOURCES = shrpx.cc shrpx.h nghttpx_SOURCES = shrpx.cc shrpx.h
nghttpx_CPPFLAGS = ${libnghttpx_a_CPPFLAGS} nghttpx_CPPFLAGS = ${libnghttpx_a_CPPFLAGS}
nghttpx_LDADD = libnghttpx.a ${LDADD} @LIBBPF_LIBS@ nghttpx_LDADD = libnghttpx.a ${LDADD}
if HAVE_MRUBY if HAVE_MRUBY
libnghttpx_a_CPPFLAGS += \ libnghttpx_a_CPPFLAGS += \
@ -219,8 +221,7 @@ nghttpx_unittest_SOURCES = shrpx-unittest.cc \
base64_test.cc base64_test.h base64_test.cc base64_test.h
nghttpx_unittest_CPPFLAGS = ${AM_CPPFLAGS} \ nghttpx_unittest_CPPFLAGS = ${AM_CPPFLAGS} \
-DNGHTTP2_SRC_DIR=\"$(top_srcdir)/src\" -DNGHTTP2_SRC_DIR=\"$(top_srcdir)/src\"
nghttpx_unittest_LDADD = libnghttpx.a ${LDADD} @CUNIT_LIBS@ @TESTLDADD@ \ nghttpx_unittest_LDADD = libnghttpx.a ${LDADD} @CUNIT_LIBS@ @TESTLDADD@
@LIBBPF_LIBS@
if HAVE_MRUBY if HAVE_MRUBY
nghttpx_unittest_CPPFLAGS += \ nghttpx_unittest_CPPFLAGS += \