From 1b6242fc583a6b871304fb995af6dc211b58f69b Mon Sep 17 00:00:00 2001
From: Adrian Dudau <adrian.dudau@enea.com>
Date: Thu, 26 Jun 2014 13:48:23 +0200
Subject: initial commit for Enea Linux 4.0

Migrated from the internal git server on the daisy-enea branch

Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
---
 .../dpdk/files/unbreak-makefiles.patch             | 87 ++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 recipes-networking/dpdk/files/unbreak-makefiles.patch

(limited to 'recipes-networking/dpdk/files/unbreak-makefiles.patch')

diff --git a/recipes-networking/dpdk/files/unbreak-makefiles.patch b/recipes-networking/dpdk/files/unbreak-makefiles.patch
new file mode 100644
index 0000000..f96dd68
--- /dev/null
+++ b/recipes-networking/dpdk/files/unbreak-makefiles.patch
@@ -0,0 +1,87 @@
+Fix  makefiles.
+
+Signed-off-by: Costin Popescu <costin.popescu@enea.com>
+Upstream-Status: Pending
+
+diff --git a/mk/rte.app.mk b/mk/rte.app.mk
+index d90a0b0..93f1dd9 100644
+--- a/mk/rte.app.mk
++++ b/mk/rte.app.mk
+@@ -203,6 +203,7 @@ endif
+ 
+ ifeq ($(LINK_USING_CC),1)
+ comma := ,
++LDFLAGS := $(patsubst -Wl$(comma)%,%,$(LDFLAGS))
+ LDLIBS := $(addprefix -Wl$(comma),$(LDLIBS))
+ LDFLAGS := $(addprefix -Wl$(comma),$(LDFLAGS))
+ override EXTRA_LDFLAGS := $(addprefix -Wl$(comma),$(EXTRA_LDFLAGS))
+diff --git a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk
+index a163272..9fb07d8 100644
+--- a/mk/target/generic/rte.vars.mk
++++ b/mk/target/generic/rte.vars.mk
+@@ -107,7 +107,7 @@ ifeq ($(KERNELRELEASE),)
+ include $(RTE_SDK)/mk/rte.cpuflags.mk
+ 
+ # merge all CFLAGS
+-CFLAGS := $(CPU_CFLAGS) $(EXECENV_CFLAGS) $(TOOLCHAIN_CFLAGS) $(MACHINE_CFLAGS)
++CFLAGS += $(CPU_CFLAGS) $(EXECENV_CFLAGS) $(TOOLCHAIN_CFLAGS) $(MACHINE_CFLAGS)
+ CFLAGS += $(TARGET_CFLAGS) $(EXTERNAL_LIB_CFLAGS)
+ 
+ # merge all LDFLAGS
+@@ -115,7 +115,7 @@ LDFLAGS := $(CPU_LDFLAGS) $(EXECENV_LDFLAGS) $(TOOLCHAIN_LDFLAGS) $(MACHINE_LDFL
+ LDFLAGS += $(TARGET_LDFLAGS)
+ 
+ # merge all ASFLAGS
+-ASFLAGS := $(CPU_ASFLAGS) $(EXECENV_ASFLAGS) $(TOOLCHAIN_ASFLAGS) $(MACHINE_ASFLAGS)
++ASFLAGS += $(CPU_ASFLAGS) $(EXECENV_ASFLAGS) $(TOOLCHAIN_ASFLAGS) $(MACHINE_ASFLAGS)
+ ASFLAGS += $(TARGET_ASFLAGS)
+ 
+ # add default include and lib paths
+diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk
+index 0edb93f..adba7d4 100644
+--- a/mk/toolchain/gcc/rte.vars.mk
++++ b/mk/toolchain/gcc/rte.vars.mk
+@@ -40,21 +40,20 @@
+ # examples for RTE_TOOLCHAIN: gcc, icc
+ #
+ 
+-CC        = $(CROSS)gcc
+-CPP       = $(CROSS)cpp
+-# for now, we don't use as but nasm.
+-# AS      = $(CROSS)as
+-AS        = nasm
+-AR        = $(CROSS)ar
+-LD        = $(CROSS)ld
+-OBJCOPY   = $(CROSS)objcopy
+-OBJDUMP   = $(CROSS)objdump
+-STRIP     = $(CROSS)strip
+-READELF   = $(CROSS)readelf
+-GCOV      = $(CROSS)gcov
++CC        ?= $(CROSS)gcc
++CPP       ?= $(CROSS)cpp
++AS       ?= $(CROSS)as
++#AS        ?= nasm
++AR        ?= $(CROSS)ar
++LD        ?= $(CROSS)ld
++OBJCOPY   ?= $(CROSS)objcopy
++OBJDUMP   ?= $(CROSS)objdump
++STRIP     ?= $(CROSS)strip
++READELF   ?= $(CROSS)readelf
++GCOV      ?= $(CROSS)gcov
+ 
+-HOSTCC    = gcc
+-HOSTAS    = as
++HOSTCC    ?= gcc
++HOSTAS    ?= as
+ 
+ TOOLCHAIN_ASFLAGS =
+ TOOLCHAIN_CFLAGS =
+@@ -68,7 +67,7 @@ ifeq (,$(findstring -O0,$(EXTRA_CFLAGS)))
+ endif
+ endif
+ 
+-WERROR_FLAGS := -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
++WERROR_FLAGS := -W -Wall -Wstrict-prototypes -Wmissing-prototypes
+ WERROR_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith
+ WERROR_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual
+ WERROR_FLAGS += -Wformat-nonliteral -Wformat-security
-- 
cgit v1.2.3-54-g00ecf