From c69847350e81e4fe6b1c494445c3d6c7f73abd86 Mon Sep 17 00:00:00 2001 From: Chunrong Guo Date: Fri, 12 Apr 2019 14:20:45 +0800 Subject: dpdk: Add missing patch Signed-off-by: Chunrong Guo --- .../dpdk/0001-add-Wno-cast-function-type.patch | 27 ++++++++++++ .../dpdk/dpdk/0001-fix-gcc-8-build-error.patch | 51 ---------------------- 2 files changed, 27 insertions(+), 51 deletions(-) create mode 100644 recipes-extended/dpdk/dpdk/0001-add-Wno-cast-function-type.patch delete mode 100644 recipes-extended/dpdk/dpdk/0001-fix-gcc-8-build-error.patch (limited to 'recipes-extended/dpdk/dpdk') diff --git a/recipes-extended/dpdk/dpdk/0001-add-Wno-cast-function-type.patch b/recipes-extended/dpdk/dpdk/0001-add-Wno-cast-function-type.patch new file mode 100644 index 00000000..0c846822 --- /dev/null +++ b/recipes-extended/dpdk/dpdk/0001-add-Wno-cast-function-type.patch @@ -0,0 +1,27 @@ +From beb13be8023beb68499c72e71a79b8f91784e484 Mon Sep 17 00:00:00 2001 +From: "C.r. Guo" +Date: Wed, 27 Mar 2019 09:35:43 +0100 +Subject: [PATCH] add -Wno-cast-function-type + +Upstream-Status: Inappropriate [configuration] + +--- + examples/cmdif/lib/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/examples/cmdif/lib/Makefile b/examples/cmdif/lib/Makefile +index d28badf..4e9851c 100644 +--- a/examples/cmdif/lib/Makefile ++++ b/examples/cmdif/lib/Makefile +@@ -28,7 +28,7 @@ SRCS-y += server/cmdif_srv_gpp.c + SRCS-y += shbp/shbp.c + + CFLAGS += -O3 +-CFLAGS += $(WERROR_FLAGS) ++CFLAGS += $(WERROR_FLAGS) -Wno-cast-function-type + CFLAGS += -I$(RTE_SDK)/examples/cmdif/lib + CFLAGS += -I$(RTE_SDK)/examples/cmdif/lib/client + CFLAGS += -I$(RTE_SDK)/examples/cmdif/lib/server +-- +2.7.4 + diff --git a/recipes-extended/dpdk/dpdk/0001-fix-gcc-8-build-error.patch b/recipes-extended/dpdk/dpdk/0001-fix-gcc-8-build-error.patch deleted file mode 100644 index 51987b53..00000000 --- a/recipes-extended/dpdk/dpdk/0001-fix-gcc-8-build-error.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 7409d0b89f80a72d91e02dc9ec688a01723c3c66 Mon Sep 17 00:00:00 2001 -From: Chunrong Guo -Date: Wed, 4 Jul 2018 17:12:39 +0800 -Subject: [PATCH] fix gcc-8 build error - -Signed-off-by: Chunrong Guo ---- - examples/ipsec-secgw/parser.c | 6 ++---- - mk/toolchain/gcc/rte.vars.mk | 2 +- - 2 files changed, 3 insertions(+), 5 deletions(-) - -diff --git a/examples/ipsec-secgw/parser.c b/examples/ipsec-secgw/parser.c -index 9d0ea46..b2b30e4 100644 ---- a/examples/ipsec-secgw/parser.c -+++ b/examples/ipsec-secgw/parser.c -@@ -544,8 +544,7 @@ parse_cfg_file(const char *cfg_filename) - goto error_exit; - } - -- strncpy(str + strlen(str), oneline, -- strlen(oneline)); -+ strcpy(str + strlen(str), oneline); - - continue; - } -@@ -557,8 +556,7 @@ parse_cfg_file(const char *cfg_filename) - cfg_filename, line_num); - goto error_exit; - } -- strncpy(str + strlen(str), oneline, -- strlen(oneline)); -+ strcpy(str + strlen(str), oneline); - - str[strlen(str)] = '\n'; - if (cmdline_parse(cl, str) < 0) { -diff --git a/mk/toolchain/gcc/rte.vars.mk b/mk/toolchain/gcc/rte.vars.mk -index 3b907e2..cc63da8 100644 ---- a/mk/toolchain/gcc/rte.vars.mk -+++ b/mk/toolchain/gcc/rte.vars.mk -@@ -75,7 +75,7 @@ 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 --WERROR_FLAGS += -Wundef -Wwrite-strings -+WERROR_FLAGS += -Wundef -Wwrite-strings -Wno-cast-function-type - - ifeq ($(RTE_DEVEL_BUILD),y) - WERROR_FLAGS += -Werror --- -2.7.4 - -- cgit v1.2.3-54-g00ecf