summaryrefslogtreecommitdiffstats
path: root/recipes-networking/dpdk/files/unbreak-makefiles.patch
diff options
context:
space:
mode:
authorAdrian Dudau <adrian.dudau@enea.com>2014-06-26 13:48:23 +0200
committerAdrian Dudau <adrian.dudau@enea.com>2014-06-26 13:48:23 +0200
commit1b6242fc583a6b871304fb995af6dc211b58f69b (patch)
treeb5d434d90dedae24792906aa304897c23a134386 /recipes-networking/dpdk/files/unbreak-makefiles.patch
downloadmeta-ip-daisy-enea.tar.gz
initial commit for Enea Linux 4.0daisy-enea
Migrated from the internal git server on the daisy-enea branch Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Diffstat (limited to 'recipes-networking/dpdk/files/unbreak-makefiles.patch')
-rw-r--r--recipes-networking/dpdk/files/unbreak-makefiles.patch87
1 files changed, 87 insertions, 0 deletions
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 @@
1Fix makefiles.
2
3Signed-off-by: Costin Popescu <costin.popescu@enea.com>
4Upstream-Status: Pending
5
6diff --git a/mk/rte.app.mk b/mk/rte.app.mk
7index d90a0b0..93f1dd9 100644
8--- a/mk/rte.app.mk
9+++ b/mk/rte.app.mk
10@@ -203,6 +203,7 @@ endif
11
12 ifeq ($(LINK_USING_CC),1)
13 comma := ,
14+LDFLAGS := $(patsubst -Wl$(comma)%,%,$(LDFLAGS))
15 LDLIBS := $(addprefix -Wl$(comma),$(LDLIBS))
16 LDFLAGS := $(addprefix -Wl$(comma),$(LDFLAGS))
17 override EXTRA_LDFLAGS := $(addprefix -Wl$(comma),$(EXTRA_LDFLAGS))
18diff --git a/mk/target/generic/rte.vars.mk b/mk/target/generic/rte.vars.mk
19index a163272..9fb07d8 100644
20--- a/mk/target/generic/rte.vars.mk
21+++ b/mk/target/generic/rte.vars.mk
22@@ -107,7 +107,7 @@ ifeq ($(KERNELRELEASE),)
23 include $(RTE_SDK)/mk/rte.cpuflags.mk
24
25 # merge all CFLAGS
26-CFLAGS := $(CPU_CFLAGS) $(EXECENV_CFLAGS) $(TOOLCHAIN_CFLAGS) $(MACHINE_CFLAGS)
27+CFLAGS += $(CPU_CFLAGS) $(EXECENV_CFLAGS) $(TOOLCHAIN_CFLAGS) $(MACHINE_CFLAGS)
28 CFLAGS += $(TARGET_CFLAGS) $(EXTERNAL_LIB_CFLAGS)
29
30 # merge all LDFLAGS
31@@ -115,7 +115,7 @@ LDFLAGS := $(CPU_LDFLAGS) $(EXECENV_LDFLAGS) $(TOOLCHAIN_LDFLAGS) $(MACHINE_LDFL
32 LDFLAGS += $(TARGET_LDFLAGS)
33
34 # merge all ASFLAGS
35-ASFLAGS := $(CPU_ASFLAGS) $(EXECENV_ASFLAGS) $(TOOLCHAIN_ASFLAGS) $(MACHINE_ASFLAGS)
36+ASFLAGS += $(CPU_ASFLAGS) $(EXECENV_ASFLAGS) $(TOOLCHAIN_ASFLAGS) $(MACHINE_ASFLAGS)
37 ASFLAGS += $(TARGET_ASFLAGS)
38
39 # add default include and lib paths
40diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk
41index 0edb93f..adba7d4 100644
42--- a/mk/toolchain/gcc/rte.vars.mk
43+++ b/mk/toolchain/gcc/rte.vars.mk
44@@ -40,21 +40,20 @@
45 # examples for RTE_TOOLCHAIN: gcc, icc
46 #
47
48-CC = $(CROSS)gcc
49-CPP = $(CROSS)cpp
50-# for now, we don't use as but nasm.
51-# AS = $(CROSS)as
52-AS = nasm
53-AR = $(CROSS)ar
54-LD = $(CROSS)ld
55-OBJCOPY = $(CROSS)objcopy
56-OBJDUMP = $(CROSS)objdump
57-STRIP = $(CROSS)strip
58-READELF = $(CROSS)readelf
59-GCOV = $(CROSS)gcov
60+CC ?= $(CROSS)gcc
61+CPP ?= $(CROSS)cpp
62+AS ?= $(CROSS)as
63+#AS ?= nasm
64+AR ?= $(CROSS)ar
65+LD ?= $(CROSS)ld
66+OBJCOPY ?= $(CROSS)objcopy
67+OBJDUMP ?= $(CROSS)objdump
68+STRIP ?= $(CROSS)strip
69+READELF ?= $(CROSS)readelf
70+GCOV ?= $(CROSS)gcov
71
72-HOSTCC = gcc
73-HOSTAS = as
74+HOSTCC ?= gcc
75+HOSTAS ?= as
76
77 TOOLCHAIN_ASFLAGS =
78 TOOLCHAIN_CFLAGS =
79@@ -68,7 +67,7 @@ ifeq (,$(findstring -O0,$(EXTRA_CFLAGS)))
80 endif
81 endif
82
83-WERROR_FLAGS := -W -Wall -Werror -Wstrict-prototypes -Wmissing-prototypes
84+WERROR_FLAGS := -W -Wall -Wstrict-prototypes -Wmissing-prototypes
85 WERROR_FLAGS += -Wmissing-declarations -Wold-style-definition -Wpointer-arith
86 WERROR_FLAGS += -Wcast-align -Wnested-externs -Wcast-qual
87 WERROR_FLAGS += -Wformat-nonliteral -Wformat-security