[PATCH 2/2] build: export dpdk_includes for subproject usage.

Markus Theil markus.theil at tu-ilmenau.de
Wed Oct 12 16:47:04 CEST 2022


From: Thorben Roemer <thorben.roemer at secunet.com>

In order to perform things like LTO more easily in
our DPDK applications, we use DPDK as a meson subproject.
Also export includes in order to be usable in this context.

Signed-off-by: Thorben Roemer <thorben.roemer at secunet.com>
---
 drivers/meson.build | 1 +
 lib/meson.build     | 1 +
 meson.build         | 1 +
 3 files changed, 3 insertions(+)

diff --git a/drivers/meson.build b/drivers/meson.build
index 216971f4e2..d19b47df12 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -95,6 +95,7 @@ foreach subpath:subdirs
         objs = []
         cflags = default_cflags
         includes = [include_directories(drv_path)]
+        dpdk_includes += [include_directories(drv_path)]
         # set up internal deps. Drivers can append/override as necessary
         deps = std_deps
         # ext_deps: Stores external library dependency got
diff --git a/lib/meson.build b/lib/meson.build
index f858844fa2..85113d0b47 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -190,6 +190,7 @@ foreach l:libraries
 
     libname = 'rte_' + name
     includes += include_directories(l)
+    dpdk_includes += include_directories(l)
 
     if developer_mode and is_windows and use_function_versioning
         message('@0@: Function versioning is not supported by Windows.'.format(name))
diff --git a/meson.build b/meson.build
index 1d35a255c3..d1cf039297 100644
--- a/meson.build
+++ b/meson.build
@@ -32,6 +32,7 @@ cc = meson.get_compiler('c')
 dpdk_source_root = meson.current_source_dir()
 dpdk_build_root = meson.current_build_dir()
 dpdk_conf = configuration_data()
+dpdk_includes = []
 dpdk_libraries = []
 dpdk_static_libraries = []
 dpdk_shared_lib_deps = []
-- 
2.38.0



More information about the dev mailing list