X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fvhost%2FMakefile;h=587ea2ab477524795ce19c84ede4933ceb3a49c7;hb=fdadccfa3fb97acf06641a5fa823b05de1cca0bb;hp=cec59d0e0fb15b1af26b786f118e996e3eb6a945;hpb=fda34680eb9abf53872bde66e119f4c0288fd62f;p=dpdk.git diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile index cec59d0e0f..587ea2ab47 100644 --- a/examples/vhost/Makefile +++ b/examples/vhost/Makefile @@ -5,10 +5,12 @@ APP = vhost-switch # all source are stored in SRCS-y -SRCS-y := main.c virtio_net.c +SRCS-y := main.c virtio_net.c ioat.c + +PKGCONF ?= pkg-config # Build using pkg-config variables if possible -ifneq ($(shell pkg-config --exists libdpdk && echo 0),0) +ifneq ($(shell $(PKGCONF) --exists libdpdk && echo 0),0) $(error "no installation of DPDK found") endif @@ -21,13 +23,19 @@ static: build/$(APP)-static LDFLAGS += -pthread -PKGCONF ?= pkg-config - PC_FILE := $(shell $(PKGCONF) --path libdpdk 2>/dev/null) CFLAGS += -O3 $(shell $(PKGCONF) --cflags libdpdk) LDFLAGS_SHARED = $(shell $(PKGCONF) --libs libdpdk) LDFLAGS_STATIC = $(shell $(PKGCONF) --static --libs libdpdk) +ifeq ($(MAKECMDGOALS),static) +# check for broken pkg-config +ifeq ($(shell echo $(LDFLAGS_STATIC) | grep 'whole-archive.*l:lib.*no-whole-archive'),) +$(warning "pkg-config output list does not contain drivers between 'whole-archive'/'no-whole-archive' flags.") +$(error "Cannot generate statically-linked binaries with this version of pkg-config") +endif +endif + CFLAGS += -DALLOW_EXPERIMENTAL_API build/$(APP)-shared: $(SRCS-y) Makefile $(PC_FILE) | build