VPP-30 sr_replicate requires DPDK

[vpp.git] / dpdk / Makefile

diff --git a/dpdk/Makefile b/dpdk/Makefile
index d7d4671..fadbb26 100644 (file)
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -16,31 +16,40 @@ SHELL := /bin/bash
 
 DPDK_BUILD_DIR        ?= $(CURDIR)/_build
 DPDK_INSTALL_DIR      ?= $(CURDIR)/_install
-DPDK_PKTMBUF_HEADROOM ?= 256
+DPDK_PKTMBUF_HEADROOM ?= 128
 DPDK_DOWNLOAD_DIR     ?= $(HOME)/Downloads
 DPDK_MARCH            ?= native
 DPDK_DEBUG            ?= n
 
 B := $(DPDK_BUILD_DIR)
 I := $(DPDK_INSTALL_DIR)
-DPDK_VERSION ?= 2.2.0
+DPDK_VERSION ?= 16.04
+DPDK_BASE_URL ?= http://dpdk.org/browse/dpdk/snapshot
 DPDK_TARBALL := dpdk-$(DPDK_VERSION).tar.gz
-DPDK_TAR_URL := http://dpdk.org/browse/dpdk/snapshot/$(DPDK_TARBALL)
+DPDK_TAR_URL := $(DPDK_BASE_URL)/$(DPDK_TARBALL)
 DPDK_2.1.0_TARBALL_MD5_CKSUM := 205a0d12bfd6eb717d57506272f43519
 DPDK_2.2.0_TARBALL_MD5_CKSUM := 22e2fd68cd5504f43fe9a5a6fd6dd938
+DPDK_16.04_TARBALL_MD5_CKSUM := 0728d506d7f56eb64233e824fa3c098a
 DPDK_SOURCE := $(B)/dpdk-$(DPDK_VERSION)
-DPDK_TARGET := x86_64-native-linuxapp-gcc
+
+ifneq (,$(findstring clang,$(CC)))
+DPDK_CC=clang
+else
+DPDK_CC=gcc
+endif
+
+DPDK_TARGET := x86_64-native-linuxapp-$(DPDK_CC)
 JOBS := $(shell grep processor /proc/cpuinfo | wc -l)
 
 # compiler/linker custom arguments
 DPDK_CPU_CFLAGS := -pie -fPIC
-DPDK_CPU_LDFLAGS := -pie -fPIC
+DPDK_CPU_LDFLAGS :=
 DPDK_EXTRA_LDFLAGS := -g
 
 ifeq ($(DPDK_DEBUG),n)
-DPDK_EXTRA_CFLAGS := -g 
+DPDK_EXTRA_CFLAGS := -g
 else
-DPDK_EXTRA_CFLAGS := -g -O0 
+DPDK_EXTRA_CFLAGS := -g -O0
 endif
 
 # translate gcc march values to DPDK arch
@@ -80,14 +89,9 @@ endef
 all: build
 
 $(B)/custom-config: $(B)/.patch.ok Makefile
-       @echo --- generating custom config from $(DPDK_SOURCE)/config/common_linuxapp ---
-       @cp $(DPDK_SOURCE)/config/common_linuxapp $@ 
+       @echo --- generating custom config from $(DPDK_SOURCE)/config/defconfig_$(DPDK_TARGET) ---
+       @cpp -undef -ffreestanding -x assembler-with-cpp $(DPDK_SOURCE)/config/defconfig_$(DPDK_TARGET) $@
        $(call set,RTE_MACHINE,$(DPDK_MACHINE))
-       $(call set,RTE_ARCH,"x86_64")
-       $(call set,RTE_ARCH_X86_64,y)
-       $(call set,RTE_ARCH_64,y)
-       $(call set,RTE_TOOLCHAIN_GCC,y)
-       $(call set,RTE_TOOLCHAIN,"gcc")
        @# modify options
        $(call set,RTE_MAX_LCORE,256)
        $(call set,RTE_PKTMBUF_HEADROOM,$(DPDK_PKTMBUF_HEADROOM))
@@ -101,14 +105,14 @@ $(B)/custom-config: $(B)/.patch.ok Makefile
        $(call set,RTE_LIBRTE_E1000_DEBUG_INIT,$(DPDK_DEBUG))
        $(call set,RTE_LIBRTE_VIRTIO_DEBUG_INIT,$(DPDK_DEBUG))
        $(call set,RTE_LIBRTE_VMXNET3_DEBUG_INIT,$(DPDK_DEBUG))
+       $(call set,RTE_LIBRTE_PMD_BOND,y)
+       $(call set,RTE_LIBRTE_IP_FRAG,y)
        @# not needed
-       $(call set,RTE_LIBRTE_PMD_BOND,n)
        $(call set,RTE_LIBRTE_TIMER,n)
        $(call set,RTE_LIBRTE_CFGFILE,n)
        $(call set,RTE_LIBRTE_LPM,n)
        $(call set,RTE_LIBRTE_ACL,n)
        $(call set,RTE_LIBRTE_POWER,n)
-       $(call set,RTE_LIBRTE_IP_FRAG,n)
        $(call set,RTE_LIBRTE_DISTRIBUTOR,n)
        $(call set,RTE_LIBRTE_REORDER,n)
        $(call set,RTE_LIBRTE_PORT,n)
@@ -144,11 +148,13 @@ $(B)/.extract.ok: $(B)/.download.ok
 extract: $(B)/.extract.ok
 
 $(B)/.patch.ok: $(B)/.extract.ok
+ifneq ($(wildcard $(CURDIR)/dpdk-$(DPDK_VERSION)_patches/*.patch),)
        @echo --- patching ---
        for f in $(CURDIR)/dpdk-$(DPDK_VERSION)_patches/*.patch ; do \
                echo Applying patch: $$(basename $$f) ; \
                patch -p1 -d $(DPDK_SOURCE) < $$f ; \
        done
+endif
        @touch $@
 
 .PHONY: patch