Bump DPDK 16.04 to RC4

[vpp.git] / dpdk / Makefile

diff --git a/dpdk/Makefile b/dpdk/Makefile
index dabbf6a..e1aafcb 100644 (file)
--- a/dpdk/Makefile
+++ b/dpdk/Makefile
@@ -24,10 +24,12 @@ DPDK_DEBUG            ?= n
 B := $(DPDK_BUILD_DIR)
 I := $(DPDK_INSTALL_DIR)
 DPDK_VERSION ?= 2.2.0
+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-rc4_TARBALL_MD5_CKSUM := 0de766a629999881e1c6e0de25d92bc0
 DPDK_SOURCE := $(B)/dpdk-$(DPDK_VERSION)
 DPDK_TARGET := x86_64-native-linuxapp-gcc
 JOBS := $(shell grep processor /proc/cpuinfo | wc -l)
@@ -81,7 +83,7 @@ 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 $@ 
+       @cpp -undef -ffreestanding -x assembler-with-cpp $(DPDK_SOURCE)/config/common_linuxapp $@
        $(call set,RTE_MACHINE,$(DPDK_MACHINE))
        $(call set,RTE_ARCH,"x86_64")
        $(call set,RTE_ARCH_X86_64,y)
@@ -144,11 +146,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