@@ -42,14 +42,14 @@ foreach drv:crypto_drivers
# set up empty variables used for build
version = 1
sources = []
- libs = []
+ objs = []
cflags = []
includes = [include_directories(drv)]
# dependency managment. External deps managed using dependency
# objects, internal deps managed by name of lib
ext_deps = []
# set up standard deps. Drivers can append/override as necessary
- deps = ['eal', 'mbuf', 'cryptodev', 'mempool', 'kvargs']
+ deps = ['mbuf', 'cryptodev', 'kvargs']
# pull in driver directory which should assign to each of the above
subdir(drv)
@@ -82,9 +82,9 @@ foreach drv:crypto_drivers
meson.current_source_dir(), drv)
lib = library(drv_name,
sources,
+ objects: objs,
include_directories: includes,
dependencies: dep_objs,
- link_with: libs,
c_args: cflags,
link_args: '-Wl,--version-script=' + version_map,
link_depends: version_map,
@@ -37,7 +37,7 @@ foreach drv:mempool_drivers
# set up empty variables used for build
version = 1
sources = []
- libs = []
+ objs = []
cflags = []
includes = [include_directories(drv)]
# dependency managment. External deps managed using dependency
@@ -77,9 +77,9 @@ foreach drv:mempool_drivers
meson.current_source_dir(), drv)
lib = library(drv_name,
sources,
+ objects: objs,
include_directories: includes,
dependencies: dep_objs,
- link_with: libs,
c_args: cflags,
link_args: '-Wl,--version-script=' + version_map,
link_depends: version_map,
@@ -53,3 +53,4 @@ endforeach
base_lib = static_library('i40e_base', sources,
dependencies: rte_eal,
c_args: c_args)
+base_objs = base_lib.extract_all_objects()
@@ -35,7 +35,7 @@ cflags = ['-DPF_DRIVER',
'-DX722_A0_SUPPORT']
subdir('base')
-libs = [base_lib]
+objs = [base_objs]
sources = files(
'i40e_ethdev.c',
@@ -57,3 +57,4 @@ endforeach
base_lib = static_library('ixgbe_base', sources,
dependencies: rte_eal,
c_args: c_args)
+base_objs = base_lib.extract_all_objects()
@@ -32,7 +32,7 @@
cflags = ['-DRTE_LIBRTE_IXGBE_BYPASS']
subdir('base')
-libs = [base_lib]
+objs = [base_objs]
sources = files(
'ixgbe_82599_bypass.c',
@@ -49,7 +49,7 @@ foreach drv:net_drivers
# set up empty variables used for build
version = 1
sources = []
- libs = []
+ objs = []
cflags = []
includes = [include_directories(drv)]
# dependency managment. External deps managed using dependency
@@ -90,9 +90,9 @@ foreach drv:net_drivers
meson.current_source_dir(), drv)
lib = library(drv_name,
sources,
+ objects: objs,
include_directories: includes,
dependencies: dep_objs,
- link_with: libs,
c_args: cflags,
link_args: '-Wl,--version-script=' + version_map,
link_depends: version_map,