net/dpdk: update to 19.11.12 point release

PR: 263423
freebsd · Apr 21, 2022 · 9e1a841 · 9e1a841
1 parent 988d3f9
commit 9e1a841
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 87 deletions.
diff --git a/net/dpdk/Makefile b/net/dpdk/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	dpdk
-DISTVERSION=	19.11.7
+DISTVERSION=	19.11.12
 CATEGORIES=	net
 MASTER_SITES=	http://fast.dpdk.org/rel/
 

diff --git a/net/dpdk/distinfo b/net/dpdk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616152895
-SHA256 (dpdk-19.11.7.tar.xz) = 6060d4f87e985c8d03ccdc223e96ecb3e115fd43912113408f3c57c025b02c2d
-SIZE (dpdk-19.11.7.tar.xz) = 12454792
+TIMESTAMP = 1650379156
+SHA256 (dpdk-19.11.12.tar.xz) = 17d9b6f8c662de7d29b0f2308d6c218886db364a06971aadaeed8e955ed36f34
+SIZE (dpdk-19.11.12.tar.xz) = 12480488
diff --git a/net/dpdk/files/patch-examples_meson.build b/net/dpdk/files/patch-examples_meson.build
diff --git a/net/dpdk/files/patch-kernel_freebsd_contigmem_contigmem.c b/net/dpdk/files/patch-kernel_freebsd_contigmem_contigmem.c
diff --git a/net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h b/net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h
@@ -1,18 +1,17 @@
---- lib/librte_eal/freebsd/eal/include/rte_os.h.orig	2021-03-17 16:43:15 UTC
+--- lib/librte_eal/freebsd/eal/include/rte_os.h.orig	2021-03-08 17:40:08 UTC
 +++ lib/librte_eal/freebsd/eal/include/rte_os.h
-@@ -14,8 +14,30 @@
+@@ -14,6 +14,28 @@
  #include <pthread_np.h>
- 
+
  typedef cpuset_t rte_cpuset_t;
--#define RTE_CPU_AND(dst, src1, src2) do \
 +
 +/* FreeBSD 14 uses GLIBC compatible CPU_AND, CPU_OR, ... */
 +#ifdef CPU_ALLOC
 +
 +#define RTE_CPU_AND(dst, src1, src2) CPU_AND(dst, src1, src2)
 +#define RTE_CPU_OR(dst, src1, src2) CPU_OR(dst, src1, src2)
 +#define RTE_CPU_FILL(set) do \
- { \
++{ \
 +	unsigned int i; \
 +	CPU_ZERO(set); \
 +	for (i = 0; i < CPU_SETSIZE; i++) \
@@ -27,35 +26,16 @@
 +
 +#else
 +
-+#define RTE_CPU_AND(dst, src1, src2) do		\
-+{ \
- 	cpuset_t tmp; \
- 	CPU_COPY(src1, &tmp); \
- 	CPU_AND(&tmp, src2); \
-@@ -29,6 +51,9 @@ typedef cpuset_t rte_cpuset_t;
- 	CPU_COPY(&tmp, dst); \
- } while (0)
- #define RTE_CPU_FILL(set) CPU_FILL(set)
-+
-+/* In FreeBSD 13 CPU_NAND macro is CPU_ANDNOT */
-+#ifdef CPU_NAND
- #define RTE_CPU_NOT(dst, src) do \
+ #define RTE_CPU_AND(dst, src1, src2) do \
  { \
  	cpuset_t tmp; \
-@@ -36,5 +61,16 @@ typedef cpuset_t rte_cpuset_t;
- 	CPU_NAND(&tmp, src); \
+@@ -47,6 +69,8 @@ typedef cpuset_t rte_cpuset_t;
+ 	CPU_ANDNOT(&tmp, src); \
  	CPU_COPY(&tmp, dst); \
  } while (0)
-+#else
-+#define RTE_CPU_NOT(dst, src) do \
-+{ \
-+	cpuset_t tmp; \
-+	CPU_FILL(&tmp); \
-+	CPU_ANDNOT(&tmp, src); \
-+	CPU_COPY(&tmp, dst); \
-+} while (0)
+-#endif
 +#endif /* CPU_NAND */
 +
 +#endif /* CPU_ALLOC */
- 
+
  #endif /* _RTE_OS_H_ */
diff --git a/net/dpdk/files/patch-meson.build b/net/dpdk/files/patch-meson.build
diff --git a/net/dpdk/pkg-plist b/net/dpdk/pkg-plist
@@ -236,6 +236,7 @@ include/rte_stack.h
 include/rte_stack_lf.h
 include/rte_stack_lf_c11.h
 include/rte_stack_lf_generic.h
+include/rte_stack_lf_stubs.h
 include/rte_stack_std.h
 include/rte_string_fns.h
 include/rte_table.h
@@ -1056,5 +1057,4 @@ lib/librte_table.so.20.0
 lib/librte_timer.a
 lib/librte_timer.so
 lib/librte_timer.so.20.0
-libdata/pkgconfig/libdpdk-libs.pc
 libdata/pkgconfig/libdpdk.pc