fix lua builds

Signed-off-by: Keith Wiles <[email protected]>
pktgen · Oct 15, 2024 · 73420d7 · 73420d7
1 parent bbf2dcb
commit 73420d7
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 28 deletions.
diff --git a/app/pktgen.h b/app/pktgen.h
@@ -36,6 +36,7 @@
 #include <time.h>
 
 #include <pg_compat.h>
+#include <pg_strings.h>
 #include <rte_config.h>
 
 #include <rte_errno.h>
@@ -488,22 +489,6 @@ do_command(const char *cmd, int (*display)(char *, int))
     return i;
 }
 
-static __inline__ int
-pg_socket_id(void)
-{
-    int sid = rte_socket_id();
-
-    return (sid == -1) ? 0 : sid;
-}
-
-static __inline__ int
-pg_eth_dev_socket_id(int pid)
-{
-    int sid = rte_eth_dev_socket_id(pid);
-
-    return (sid == -1) ? 0 : sid;
-}
-
 #ifndef MEMPOOL_F_DMA
 #define MEMPOOL_F_DMA 0
 #endif

diff --git a/lib/common/pg_compat.h b/lib/common/pg_compat.h
@@ -24,6 +24,22 @@ extern "C" {
 #define PG_JUMBO_ETHER_MTU 9216
 #define PG_JUMBO_FRAME_LEN (PG_JUMBO_ETHER_MTU + RTE_ETHER_CRC_LEN + RTE_ETHER_HDR_LEN)
 
+static __inline__ int
+pg_socket_id(void)
+{
+    int sid = rte_socket_id();
+
+    return (sid == -1) ? 0 : sid;
+}
+
+static __inline__ int
+pg_eth_dev_socket_id(int pid)
+{
+    int sid = rte_eth_dev_socket_id(pid);
+
+    return (sid == -1) ? 0 : sid;
+}
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/vec/meson.build b/lib/vec/meson.build
@@ -2,7 +2,5 @@
 # Copyright(c) <2020-2024> Intel Corporation
 
 sources = files('vec.c')
-libvec = library('vec', sources,
-	dependencies: [utils, dpdk])
-vec = declare_dependency(link_with: libvec,
-	include_directories: include_directories('.'))
+libvec = library('vec', sources, dependencies: [common, utils, dpdk])
+vec = declare_dependency(link_with: libvec, include_directories: include_directories('.'))
diff --git a/lib/vec/vec.c b/lib/vec/vec.c
@@ -10,14 +10,6 @@
 
 #include "vec.h"
 
-static __inline__ int
-pg_socket_id(void)
-{
-    int sid = rte_socket_id();
-
-    return (sid == -1) ? 0 : sid;
-}
-
 static void
 vec_obj_init(struct rte_mempool *mp, void *uarg __rte_unused, void *obj, unsigned idx __rte_unused)
 {

diff --git a/lib/vec/vec.h b/lib/vec/vec.h
@@ -7,6 +7,7 @@
 #define __VEC_H
 
 #include <rte_malloc.h>
+#include <pg_compat.h>
 
 #ifdef __cplusplus
 extern "C" {