Attachment #209150 for bug #241949

Lines 1-7 Link Here

(-)net/dpdk/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	PORTNAME= dpdk	3	PORTNAME= dpdk
4	PORTVERSION= 18.05.1	4	PORTVERSION= 18.11.4
5	CATEGORIES= net	5	CATEGORIES= net
6	MASTER_SITES= http://fast.dpdk.org/rel/	6	MASTER_SITES= http://fast.dpdk.org/rel/
7		7

Lines 1-3 Link Here

(-)net/dpdk/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1547152584	1	TIMESTAMP = 1573652267
2	SHA256 (dpdk-18.05.1.tar.gz) = be0da492290a303b0b09b79b8c9f6976ea7703ecf9f04d50aeead021c82b94b0	2	SHA256 (dpdk-18.11.4.tar.gz) = e9272f8d59296b3d71b5c6bbbc592513d185ee1653f831f714901e4de6e6b266
3	SIZE (dpdk-18.05.1.tar.gz) = 13919248	3	SIZE (dpdk-18.11.4.tar.gz) = 14473510




--- kernel/freebsd/contigmem/contigmem.c.orig	2018-09-05 14:29:02 UTC
+++ kernel/freebsd/contigmem/contigmem.c
@@ -9,9 +9,12 @@
 #include <sys/bio.h>
 #include <sys/bus.h>
 #include <sys/conf.h>
+#include <sys/eventhandler.h>
 #include <sys/kernel.h>
+#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
+#include <sys/mutex.h>
 #include <sys/proc.h>
 #include <sys/rwlock.h>
 #include <sys/systm.h>

Lines 1-10 Link Here

(-)net/dpdk/files/patch-kernel-freebsd-nic_uio-nic_uio.c (-10 lines)
1	--- kernel/freebsd/nic_uio/nic_uio.c.orig 2018-09-05 14:29:02 UTC
2	+++ kernel/freebsd/nic_uio/nic_uio.c
3	@@ -9,6 +9,7 @@
4	#include <sys/kernel.h> /* types used in module initialization */
5	#include <sys/conf.h> /* cdevsw struct */
6	#include <sys/bus.h> /* structs, prototypes for pci bus stuff and DEVMETHOD */
7	+#include <sys/lock.h> /* used by vm_pager.h => MPASS() */
8	#include <sys/rman.h>
9	#include <sys/systm.h>
10	#include <sys/rwlock.h>




--- lib/librte_eal/common/include/rte_dev.h.orig	2019-11-14 17:31:56 UTC
+++ lib/librte_eal/common/include/rte_dev.h
@@ -43,7 +43,9 @@ typedef void (*rte_dev_event_cb_fn)(const char *device
 					enum rte_dev_event_type event,
 					void *cb_arg);
 
-__attribute__((format(printf, 2, 0)))
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+__attribute__((format(printf, 2, 3)))
 static inline void
 rte_pmd_debug_trace(const char *func_name, const char *fmt, ...)
 {
@@ -64,6 +66,7 @@ rte_pmd_debug_trace(const char *func_name, const char 
 			func_name, buffer);
 	}
 }
+#pragma GCC diagnostic pop
 
 /*
  * Enable RTE_PMD_DEBUG_TRACE() when at least one component relying on the

Return to bug 241949

Lines 1-15 Link Here

(-)net/dpdk/files/patch-kernel-freebsd-contigmem-contigmem.c (-15 lines)
1	--- kernel/freebsd/contigmem/contigmem.c.orig 2018-09-05 14:29:02 UTC
2	+++ kernel/freebsd/contigmem/contigmem.c
3	@@ -9,9 +9,12 @@
4	#include <sys/bio.h>
5	#include <sys/bus.h>
6	#include <sys/conf.h>
7	+#include <sys/eventhandler.h>
8	#include <sys/kernel.h>
9	+#include <sys/lock.h>
10	#include <sys/malloc.h>
11	#include <sys/module.h>
12	+#include <sys/mutex.h>
13	#include <sys/proc.h>
14	#include <sys/rwlock.h>
15	#include <sys/systm.h>

Line 0 Link Here

(-)net/dpdk/files/patch-lib_librte__eal_common_include_rte__dev.h (+21 lines)
	1	--- lib/librte_eal/common/include/rte_dev.h.orig 2019-11-14 17:31:56 UTC
	2	+++ lib/librte_eal/common/include/rte_dev.h
	3	@@ -43,7 +43,9 @@ typedef void (rte_dev_event_cb_fn)(const char device
	4	enum rte_dev_event_type event,
	5	void *cb_arg);
	6
	7	-__attribute__((format(printf, 2, 0)))
	8	+#pragma GCC diagnostic push
	9	+#pragma GCC diagnostic ignored "-Wformat-nonliteral"
	10	+__attribute__((format(printf, 2, 3)))
	11	static inline void
	12	rte_pmd_debug_trace(const char func_name, const char fmt, ...)
	13	{
	14	@@ -64,6 +66,7 @@ rte_pmd_debug_trace(const char *func_name, const char
	15	func_name, buffer);
	16	}
	17	}
	18	+#pragma GCC diagnostic pop
	19
	20	/*
	21	* Enable RTE_PMD_DEBUG_TRACE() when at least one component relying on the

Lines 1-5 Link Here

(-)net/dpdk/pkg-plist (-9 / +49 lines)
1	/%%KMODDIR%%/contigmem.ko	1	/%%KMODDIR%%/contigmem.ko
2	/%%KMODDIR%%/nic_uio.ko	2	/%%KMODDIR%%/nic_uio.ko
		3	%%TOOLS%%bin/dpdk-pmdinfo.py
3	include/dpdk	4	include/dpdk
4	lib/dpdk	5	lib/dpdk
5	%%DATADIR%%/examples/Makefile	6	%%DATADIR%%/examples/Makefile
Lines 38-43 Link Here
38	%%DATADIR%%/examples/exception_path/Makefile	39	%%DATADIR%%/examples/exception_path/Makefile
39	%%DATADIR%%/examples/exception_path/main.c	40	%%DATADIR%%/examples/exception_path/main.c
40	%%DATADIR%%/examples/exception_path/meson.build	41	%%DATADIR%%/examples/exception_path/meson.build
		42	%%DATADIR%%/examples/fips_validation/Makefile
		43	%%DATADIR%%/examples/fips_validation/fips_validation.c
		44	%%DATADIR%%/examples/fips_validation/fips_validation.h
		45	%%DATADIR%%/examples/fips_validation/fips_validation_aes.c
		46	%%DATADIR%%/examples/fips_validation/fips_validation_ccm.c
		47	%%DATADIR%%/examples/fips_validation/fips_validation_cmac.c
		48	%%DATADIR%%/examples/fips_validation/fips_validation_gcm.c
		49	%%DATADIR%%/examples/fips_validation/fips_validation_hmac.c
		50	%%DATADIR%%/examples/fips_validation/fips_validation_tdes.c
		51	%%DATADIR%%/examples/fips_validation/main.c
		52	%%DATADIR%%/examples/fips_validation/meson.build
41	%%DATADIR%%/examples/flow_classify/Makefile	53	%%DATADIR%%/examples/flow_classify/Makefile
42	%%DATADIR%%/examples/flow_classify/flow_classify.c	54	%%DATADIR%%/examples/flow_classify/flow_classify.c
43	%%DATADIR%%/examples/flow_classify/ipv4_rules_file.txt	55	%%DATADIR%%/examples/flow_classify/ipv4_rules_file.txt
Lines 60-74 Link Here
60	%%DATADIR%%/examples/ip_pipeline/common.h	72	%%DATADIR%%/examples/ip_pipeline/common.h
61	%%DATADIR%%/examples/ip_pipeline/conn.c	73	%%DATADIR%%/examples/ip_pipeline/conn.c
62	%%DATADIR%%/examples/ip_pipeline/conn.h	74	%%DATADIR%%/examples/ip_pipeline/conn.h
		75	%%DATADIR%%/examples/ip_pipeline/cryptodev.c
		76	%%DATADIR%%/examples/ip_pipeline/cryptodev.h
63	%%DATADIR%%/examples/ip_pipeline/examples/firewall.cli	77	%%DATADIR%%/examples/ip_pipeline/examples/firewall.cli
64	%%DATADIR%%/examples/ip_pipeline/examples/flow.cli	78	%%DATADIR%%/examples/ip_pipeline/examples/flow.cli
		79	%%DATADIR%%/examples/ip_pipeline/examples/flow_crypto.cli
65	%%DATADIR%%/examples/ip_pipeline/examples/kni.cli	80	%%DATADIR%%/examples/ip_pipeline/examples/kni.cli
66	%%DATADIR%%/examples/ip_pipeline/examples/l2fwd.cli	81	%%DATADIR%%/examples/ip_pipeline/examples/l2fwd.cli
67	%%DATADIR%%/examples/ip_pipeline/examples/route.cli	82	%%DATADIR%%/examples/ip_pipeline/examples/route.cli
68	%%DATADIR%%/examples/ip_pipeline/examples/route_ecmp.cli	83	%%DATADIR%%/examples/ip_pipeline/examples/route_ecmp.cli
		84	%%DATADIR%%/examples/ip_pipeline/examples/rss.cli