diff options
| author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2023-12-29 23:17:50 +0100 |
|---|---|---|
| committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2023-12-30 08:16:41 +0100 |
| commit | 35b06fb1497aff804abe21e254ea4cf5829953b2 (patch) | |
| tree | 2ce7e64aac6d166be0645b6fb98d98fe79263823 /net/dpdk/files | |
| parent | databases/mysql-connector-odbc-80: Remove references to percona (diff) | |
net/dpdk: Move net/dpdk-22.11 to net/dpdk
net/dpdk was about to expire in lieu of net/dpdk-22.11. So move
net/dpdk-22.11 to dpdk.
When there are multiple versions in the ports tree always keep the most
latest stable version without the suffix/prefix and adjust accordingly
for other versions.
Approved by: portmgr (blanket)
Diffstat (limited to 'net/dpdk/files')
4 files changed, 14 insertions, 43 deletions
diff --git a/net/dpdk/files/patch-config_meson.build b/net/dpdk/files/patch-config_meson.build new file mode 100644 index 000000000000..bad754fc1390 --- /dev/null +++ b/net/dpdk/files/patch-config_meson.build @@ -0,0 +1,12 @@ +--- config/meson.build.orig 2023-07-18 14:47:33.929900000 +0100 ++++ config/meson.build 2023-07-18 14:47:36.329284000 +0100 +@@ -207,6 +207,9 @@ + dpdk_conf.set('RTE_BACKTRACE', cc.has_header('execinfo.h') or is_windows) + + libarchive = dependency('libarchive', required: false, method: 'pkg-config') ++if not libarchive.found() ++ libarchive = cc.find_library('archive', required: false) ++endif + if libarchive.found() + dpdk_conf.set('RTE_HAS_LIBARCHIVE', 1) + # Push libarchive link dependency at the project level to support diff --git a/net/dpdk/files/patch-kernel_freebsd_contigmem_contigmem.c b/net/dpdk/files/patch-kernel_freebsd_contigmem_contigmem.c index bcf2930a29eb..fa54be32ef58 100644 --- a/net/dpdk/files/patch-kernel_freebsd_contigmem_contigmem.c +++ b/net/dpdk/files/patch-kernel_freebsd_contigmem_contigmem.c @@ -1,4 +1,4 @@ ---- kernel/freebsd/contigmem/contigmem.c.orig 2023-05-19 13:59:05 UTC +--- kernel/freebsd/contigmem/contigmem.c.orig 2023-05-20 00:00:38 UTC +++ kernel/freebsd/contigmem/contigmem.c @@ -111,7 +111,7 @@ static int }; diff --git a/net/dpdk/files/patch-kernel_freebsd_nic__uio_nic__uio.c b/net/dpdk/files/patch-kernel_freebsd_nic__uio_nic__uio.c index d4dac8f04019..27bd60e20b78 100644 --- a/net/dpdk/files/patch-kernel_freebsd_nic__uio_nic__uio.c +++ b/net/dpdk/files/patch-kernel_freebsd_nic__uio_nic__uio.c @@ -1,4 +1,4 @@ ---- kernel/freebsd/nic_uio/nic_uio.c.orig 2022-07-26 18:39:52 UTC +--- kernel/freebsd/nic_uio/nic_uio.c.orig 2022-07-26 18:52:05 UTC +++ kernel/freebsd/nic_uio/nic_uio.c @@ -78,10 +78,14 @@ struct pci_bdf { uint32_t function; 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 deleted file mode 100644 index ab5c07dcae51..000000000000 --- a/net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h +++ /dev/null @@ -1,41 +0,0 @@ ---- 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,6 +14,28 @@ - #include <pthread_np.h> - - typedef cpuset_t rte_cpuset_t; -+ -+/* 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_ */ |