diff --git a/net/dpdk-20.11/Makefile b/net/dpdk-20.11/Makefile index 0f3a4ca1c446..2bcee20b0863 100644 --- a/net/dpdk-20.11/Makefile +++ b/net/dpdk-20.11/Makefile @@ -1,51 +1,51 @@ PORTNAME= dpdk -DISTVERSION= 20.11.5 +DISTVERSION= 20.11.8 CATEGORIES= net MASTER_SITES= http://fast.dpdk.org/rel/ PKGNAMESUFFIX= 20.11 MAINTAINER= bruce.richardson@intel.com COMMENT= DPDK: Software libraries for packet processing WWW= https://dpdk.org/ LICENSE= BSD3CLAUSE ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= only tested on 64-bit x86 hardware BUILD_DEPENDS= objdump:devel/binutils -LIB_DEPENDS= libjansson.so:devel/jansson +LIB_DEPENDS= libelf.so:devel/elfutils \ + libjansson.so:devel/jansson -USES= meson kmod pkgconfig:both shebangfix tar:xz python:3.5+ +USES= kmod meson pkgconfig:both python:3.5+ shebangfix tar:xz USE_LDCONFIG= yes -MESON_ARGS= -Dmachine=default -Ddefault_library=shared -Denable_kmods=true -SHEBANG_FILES= usertools/dpdk-pmdinfo.py \ - usertools/dpdk-telemetry-client.py \ - usertools/dpdk-telemetry.py \ - usertools/dpdk-devbind.py \ - usertools/dpdk-pmdinfo.py \ - usertools/dpdk-hugepages.py \ - examples/ipsec-secgw/test/pkttest.py \ +SHEBANG_FILES= examples/ipsec-secgw/test/pkttest.py \ examples/ipsec-secgw/test/pkttest.sh \ examples/ipsec-secgw/test/run_test.sh \ examples/ipsec-secgw/test/trs_ipv6opts.py \ examples/ipsec-secgw/test/tun_null_header_reconstruct.py \ examples/performance-thread/l3fwd-thread/test.sh \ examples/pipeline/examples/vxlan_table.py \ + usertools/dpdk-devbind.py usertools/dpdk-hugepages.py \ + usertools/dpdk-pmdinfo.py usertools/dpdk-telemetry-client.py \ + usertools/dpdk-telemetry.py +MESON_ARGS= -Ddefault_library=shared \ + -Denable_kmods=true \ + -Dmachine=default WRKSRC= ${WRKDIR}/${PORTNAME}-stable-${PORTVERSION} -OPTIONS_DEFINE= EXAMPLES DEBUG TOOLS TESTS +OPTIONS_DEFINE= DEBUG EXAMPLES TESTS TOOLS OPTIONS_DEFAULT= TOOLS OPTIONS_SUB= yes DEBUG_DESC= Debugging support (unoptimized build, impacts performance) -TOOLS_DESC= Install tool scripts TESTS_DESC= Build the automated unit test binary +TOOLS_DESC= Install tool scripts DEBUG_MESON_ON= --buildtype=debug DEBUG_MESON_OFF= --buildtype=release EXAMPLES_MESON_ON= -Dexamples=all TESTS_MESON_TRUE= tests TOOLS_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyelftools>=0:devel/py-pyelftools@${PY_FLAVOR} .include diff --git a/net/dpdk-20.11/distinfo b/net/dpdk-20.11/distinfo index c77fc4a56675..d1b707570831 100644 --- a/net/dpdk-20.11/distinfo +++ b/net/dpdk-20.11/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1649077024 -SHA256 (dpdk-20.11.5.tar.xz) = caad9278dd99386940021355436b20a745daadb6c321893fa5a81d0feb023c7f -SIZE (dpdk-20.11.5.tar.xz) = 14021364 +TIMESTAMP = 1683105631 +SHA256 (dpdk-20.11.8.tar.xz) = 853f2d837816d4fa427fd996fbac116cccf2dec34d01f46df4be43e0b953f3bf +SIZE (dpdk-20.11.8.tar.xz) = 14045916 diff --git a/net/dpdk-20.11/files/patch-lib_librte__eal_freebsd_include_rte__os.h b/net/dpdk-20.11/files/patch-lib_librte__eal_freebsd_include_rte__os.h deleted file mode 100644 index fab2a5de8163..000000000000 --- a/net/dpdk-20.11/files/patch-lib_librte__eal_freebsd_include_rte__os.h +++ /dev/null @@ -1,41 +0,0 @@ ---- lib/librte_eal/freebsd/include/rte_os.h.orig 2021-03-08 17:40:08 UTC -+++ lib/librte_eal/freebsd/include/rte_os.h -@@ -14,6 +14,28 @@ - - typedef cpuset_t rte_cpuset_t; - #define RTE_HAS_CPUSET -+ -+/* 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++) \ -+ CPU_SET(i, set); \ -+} while (0) -+#define RTE_CPU_NOT(dst, src) do \ -+{ \ -+ cpu_set_t tmp; \ -+ RTE_CPU_FILL(&tmp); \ -+ CPU_XOR(dst, &tmp, src); \ -+} while (0) -+ -+#else -+ - #define RTE_CPU_AND(dst, src1, src2) do \ - { \ - cpuset_t tmp; \ -@@ -47,6 +69,8 @@ typedef cpuset_t rte_cpuset_t; - CPU_ANDNOT(&tmp, src); \ - CPU_COPY(&tmp, dst); \ - } while (0) --#endif -+#endif /* CPU_NAND */ -+ -+#endif /* CPU_ALLOC */ - - #endif /* _RTE_OS_H_ */