@@ -29,75 +29,80 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-crypto_drivers = ['null']
-
-libcrypto_dep = dependency('libcrypto', required: false)
-if libcrypto_dep.found()
- crypto_drivers += ['qat', 'openssl']
-endif
-
-foreach drv:crypto_drivers
- dpdk_conf.set('RTE_LIBRTE_@0@_PMD'.format(drv.to_upper()),1)
+drivers = ['null', 'qat', 'openssl']
+std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps
+foreach drv:drivers
# set up empty variables used for build
+ build = true # set to false to disable, e.g. missing deps
version = 1
sources = []
objs = []
cflags = []
includes = [include_directories(drv)]
- # dependency managment. External deps managed using dependency
- # objects, internal deps managed by name of lib
+ # set up internal deps. Drivers can append/override as necessary
+ deps = std_deps
+ # ext_deps: Stores external library dependency got
+ # using dependency() or cc.find_library(). For most cases, we
+ # probably also need to specify the "-l" flags in
+ # pkgconfig_extra_libs variable too, so that it can be reflected
+ # in the pkgconfig output for static builds
ext_deps = []
- # set up standard deps. Drivers can append/override as necessary
- deps = ['mbuf', 'cryptodev', 'kvargs']
+ pkgconfig_extra_libs = []
# pull in driver directory which should assign to each of the above
subdir(drv)
- # get dependency objs from strings
- dep_objs = ext_deps
- foreach d:deps
- dep_objs += [get_variable('dep_rte_' + d)] + dep_objs
- endforeach
-
- # generate pmdinfo sources
- pmdinfogen_srcs = run_command('grep', '--files-with-matches',
- 'RTE_PMD_REGISTER_.*(.*)', sources).stdout().strip().split()
- foreach src: pmdinfogen_srcs
- out_filename = '@0@.pmd.c'.format(src.split('/')[-1])
- tmp_lib = static_library('tmp_@0@'.format(src.underscorify()),
- src, include_directories: includes,
- dependencies: dep_objs,
- c_args: cflags)
- sources += custom_target(out_filename,
- command: [pmdinfo, tmp_lib.full_path(),
- '@OUTPUT@', pmdinfogen],
- output: out_filename,
- depends: [pmdinfogen, tmp_lib])
- endforeach
+ if build
+ dpdk_conf.set('RTE_LIBRTE_@0@_PMD'.format(drv.to_upper()),1)
- # now build the driver itself, and add to the drivers list
- drv_name = 'rte_pmd_@0@'.format(drv)
- version_map = '@0@/@1@/rte_pmd_@1@_version.map'.format(
- meson.current_source_dir(), drv)
- lib = library(drv_name,
- sources,
- objects: objs,
- include_directories: includes,
- dependencies: dep_objs,
- c_args: cflags,
- link_args: '-Wl,--version-script=' + version_map,
- link_depends: version_map,
- version: '@0@.1'.format(version),
- install: true,
- install_dir: driver_install_path)
+ # get dependency objs from strings
+ dep_objs = []
+ foreach d:deps
+ dep_objs += [get_variable('dep_rte_' + d)] + dep_objs
+ endforeach
+ dep_objs += ext_deps
+ dpdk_extra_ldflags += pkgconfig_extra_libs
- dpdk_drivers += lib
+ # generate pmdinfo sources
+ pmdinfogen_srcs = run_command('grep', '--files-with-matches',
+ 'RTE_PMD_REGISTER_.*(.*)', sources).stdout().strip().split()
+ foreach src: pmdinfogen_srcs
+ out_filename = '@0@.pmd.c'.format(src.split('/')[-1])
+ tmp_lib = static_library('tmp_@0@'.format(src.underscorify()),
+ src, include_directories: includes,
+ dependencies: dep_objs,
+ c_args: cflags)
+ sources += custom_target(out_filename,
+ command: [pmdinfo, tmp_lib.full_path(),
+ '@OUTPUT@', pmdinfogen],
+ output: out_filename,
+ depends: [pmdinfogen, tmp_lib])
+ endforeach
- # create a dependency object and add it to the global dictionary so
- # testpmd or other built-in apps can find it if necessary
- set_variable('dep_rte_pmd_@0@'.format(drv),
- declare_dependency(link_with: lib,
+ # now build the driver itself, and add to the drivers list
+ drv_name = 'rte_pmd_@0@'.format(drv)
+ version_map = '@0@/@1@/rte_pmd_@1@_version.map'.format(
+ meson.current_source_dir(), drv)
+ lib = library(drv_name,
+ sources,
+ objects: objs,
include_directories: includes,
- dependencies: dep_objs))
+ dependencies: dep_objs,
+ c_args: cflags,
+ link_args: '-Wl,--version-script=' + version_map,
+ link_depends: version_map,
+ version: '@0@.1'.format(version),
+ install: true,
+ install_dir: driver_install_path)
+
+ dpdk_drivers += lib
+
+ # create a dependency object and add it to the global dictionary so
+ # testpmd or other built-in apps can find it if necessary
+ set_variable('dep_rte_pmd_@0@'.format(drv),
+ declare_dependency(link_with: lib,
+ include_directories: includes,
+ dependencies: dep_objs))
+ endif # build
endforeach
@@ -29,5 +29,10 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+dep = dependency('libcrypto', required: false)
+if not dep.found()
+ build = false
+endif
sources = files('rte_openssl_pmd.c', 'rte_openssl_pmd_ops.c')
-ext_deps += libcrypto_dep
+ext_deps += dep
+pkgconfig_extra_libs += '-lcrypto'
@@ -29,8 +29,13 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+dep = dependency('libcrypto', required: false)
+if not dep.found()
+ build = false
+endif
sources = files('qat_crypto.c', 'qat_qp.c',
'qat_adf/qat_algs_build_desc.c',
'rte_qat_cryptodev.c')
includes += include_directories('qat_adf')
-ext_deps += libcrypto_dep
+ext_deps += dep
+pkgconfig_extra_libs += '-lcrypto'
@@ -29,70 +29,80 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-mempool_drivers = ['ring', 'stack']
-
-foreach drv:mempool_drivers
- dpdk_conf.set('RTE_LIBRTE_@0@_PMD'.format(drv.to_upper()),1)
+drivers = ['ring', 'stack']
+std_deps = ['mempool']
+foreach drv:drivers
# set up empty variables used for build
+ build = true # set to false to disable, e.g. missing deps
version = 1
sources = []
objs = []
cflags = []
includes = [include_directories(drv)]
- # dependency managment. External deps managed using dependency
- # objects, internal deps managed by name of lib
+ # set up internal deps. Drivers can append/override as necessary
+ deps = std_deps
+ # ext_deps: Stores external library dependency got
+ # using dependency() or cc.find_library(). For most cases, we
+ # probably also need to specify the "-l" flags in
+ # pkgconfig_extra_libs variable too, so that it can be reflected
+ # in the pkgconfig output for static builds
ext_deps = []
- # set up standard deps. Drivers can append/override as necessary
- deps = ['eal', 'mempool', 'ring']
+ pkgconfig_extra_libs = []
# pull in driver directory which should assign to each of the above
subdir(drv)
- # get dependency objs from strings
- dep_objs = ext_deps
- foreach d:deps
- dep_objs += [get_variable('dep_rte_' + d)] + dep_objs
- endforeach
-
- # generate pmdinfo sources
- pmdinfogen_srcs = run_command('grep', '--files-with-matches',
- 'RTE_PMD_REGISTER_.*(.*)', sources).stdout().strip().split()
- foreach src: pmdinfogen_srcs
- out_filename = '@0@.pmd.c'.format(src.split('/')[-1])
- tmp_lib = static_library('tmp_@0@'.format(src.underscorify()),
- src, include_directories: includes,
- dependencies: dep_objs,
- c_args: cflags)
- sources += custom_target(out_filename,
- command: [pmdinfo, tmp_lib.full_path(),
- '@OUTPUT@', pmdinfogen],
- output: out_filename,
- depends: [pmdinfogen, tmp_lib])
- endforeach
+ if build
+ dpdk_conf.set('RTE_LIBRTE_@0@_MEMPOOL'.format(drv.to_upper()),1)
- # now build the driver itself, and add to the drivers list
- drv_name = 'rte_mempool_@0@'.format(drv)
- version_map = '@0@/@1@/rte_mempool_@1@_version.map'.format(
- meson.current_source_dir(), drv)
- lib = library(drv_name,
- sources,
- objects: objs,
- include_directories: includes,
- dependencies: dep_objs,
- c_args: cflags,
- link_args: '-Wl,--version-script=' + version_map,
- link_depends: version_map,
- version: '@0@.1'.format(version),
- install: true,
- install_dir: driver_install_path)
+ # get dependency objs from strings
+ dep_objs = []
+ foreach d:deps
+ dep_objs += [get_variable('dep_rte_' + d)] + dep_objs
+ endforeach
+ dep_objs += ext_deps
+ dpdk_extra_ldflags += pkgconfig_extra_libs
- dpdk_drivers += lib
+ # generate pmdinfo sources
+ pmdinfogen_srcs = run_command('grep', '--files-with-matches',
+ 'RTE_PMD_REGISTER_.*(.*)', sources).stdout().strip().split()
+ foreach src: pmdinfogen_srcs
+ out_filename = '@0@.pmd.c'.format(src.split('/')[-1])
+ tmp_lib = static_library('tmp_@0@'.format(src.underscorify()),
+ src, include_directories: includes,
+ dependencies: dep_objs,
+ c_args: cflags)
+ sources += custom_target(out_filename,
+ command: [pmdinfo, tmp_lib.full_path(),
+ '@OUTPUT@', pmdinfogen],
+ output: out_filename,
+ depends: [pmdinfogen, tmp_lib])
+ endforeach
- # create a dependency object and add it to the global dictionary so
- # testpmd or other built-in apps can find it if necessary
- set_variable('dep_rte_mempool_@0@'.format(drv),
- declare_dependency(link_with: lib,
+ # now build the driver itself, and add to the drivers list
+ drv_name = 'rte_mempool_@0@'.format(drv)
+ version_map = '@0@/@1@/rte_mempool_@1@_version.map'.format(
+ meson.current_source_dir(), drv)
+ lib = library(drv_name,
+ sources,
+ objects: objs,
include_directories: includes,
- dependencies: dep_objs))
+ dependencies: dep_objs,
+ c_args: cflags,
+ link_args: '-Wl,--version-script=' + version_map,
+ link_depends: version_map,
+ version: '@0@.1'.format(version),
+ install: true,
+ install_dir: driver_install_path)
+
+ dpdk_drivers += lib
+
+ # create a dependency object and add it to the global dictionary so
+ # testpmd or other built-in apps can find it if necessary
+ set_variable('dep_rte_mempool_@0@'.format(drv),
+ declare_dependency(link_with: lib,
+ include_directories: includes,
+ dependencies: dep_objs))
+ endif # build
endforeach
@@ -29,4 +29,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+if host_machine.system() != 'linux'
+ build = false
+endif
sources = files('rte_eth_af_packet.c')
@@ -41,4 +41,5 @@ sources = files('ark_ddm.c',
'ark_udm.c')
if host_machine.system() == 'linux'
ext_deps += cc.find_library('dl')
+ pkgconfig_extra_libs += '-ldl'
endif
@@ -29,83 +29,80 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-net_drivers = ['ark', 'avp', 'i40e', 'ixgbe']
-
-# af_packet only works on linux
-if host_machine.system() == 'linux'
- net_drivers += 'af_packet'
-endif
-
-pcap_dep = dependency('pcap', required: false)
-# pcap doesn't use pkg-config, but future meson versions should support picking
-# it up as a dependency. For older versions <0.42 use find_program instead
-if pcap_dep.found() or find_program('pcap-config', required: false).found()
- net_drivers += 'pcap'
-endif
-
-foreach drv:net_drivers
- dpdk_conf.set('RTE_LIBRTE_@0@_PMD'.format(drv.to_upper()),1)
+drivers = ['af_packet', 'ark', 'avp', 'i40e', 'ixgbe', 'pcap']
+std_deps = ['ether', 'kvargs'] # 'ether' as dep, also pulls in mbuf, net, mempool, eal etc
+foreach drv:drivers
# set up empty variables used for build
+ build = true # set to false to disable, e.g. missing deps
version = 1
sources = []
objs = []
cflags = []
includes = [include_directories(drv)]
- # dependency managment. External deps managed using dependency
- # objects, internal deps managed by name of lib
+ # set up internal deps. Drivers can append/override as necessary
+ deps = std_deps
+ # ext_deps: Stores external library dependency got
+ # using dependency() or cc.find_library(). For most cases, we
+ # probably also need to specify the "-l" flags in
+ # pkgconfig_extra_libs variable too, so that it can be reflected
+ # in the pkgconfig output for static builds
ext_deps = []
- # set up standard deps. Drivers can append/override as necessary
- # 'ether' as dep, also pulls in mbuf, net, mempool, ring, eal etc
- deps = ['ether', 'kvargs']
+ pkgconfig_extra_libs = []
# pull in driver directory which should assign to each of the above
subdir(drv)
- # get dependency objs from strings
- dep_objs = ext_deps
- foreach d:deps
- dep_objs += [get_variable('dep_rte_' + d)] + dep_objs
- endforeach
-
- # generate pmdinfo sources
- pmdinfogen_srcs = run_command('grep', '--files-with-matches',
- 'RTE_PMD_REGISTER_.*(.*)', sources).stdout().strip().split()
- foreach src: pmdinfogen_srcs
- out_filename = '@0@.pmd.c'.format(src.split('/')[-1])
- tmp_lib = static_library('tmp_@0@'.format(src.underscorify()),
- src, include_directories: includes,
- dependencies: dep_objs,
- c_args: cflags)
- sources += custom_target(out_filename,
- command: [pmdinfo, tmp_lib.full_path(),
- '@OUTPUT@', pmdinfogen],
- output: out_filename,
- depends: [pmdinfogen, tmp_lib])
- endforeach
+ if build
+ dpdk_conf.set('RTE_LIBRTE_@0@_PMD'.format(drv.to_upper()),1)
- # now build the driver itself, and add to the drivers list
- drv_name = 'rte_pmd_@0@'.format(drv)
- version_map = '@0@/@1@/rte_pmd_@1@_version.map'.format(
- meson.current_source_dir(), drv)
- lib = library(drv_name,
- sources,
- objects: objs,
- include_directories: includes,
- dependencies: dep_objs,
- c_args: cflags,
- link_args: '-Wl,--version-script=' + version_map,
- link_depends: version_map,
- version: '@0@.1'.format(version),
- install: true,
- install_dir: driver_install_path)
+ # get dependency objs from strings
+ dep_objs = []
+ foreach d:deps
+ dep_objs += [get_variable('dep_rte_' + d)] + dep_objs
+ endforeach
+ dep_objs += ext_deps
+ dpdk_extra_ldflags += pkgconfig_extra_libs
- dpdk_drivers += lib
+ # generate pmdinfo sources
+ pmdinfogen_srcs = run_command('grep', '--files-with-matches',
+ 'RTE_PMD_REGISTER_.*(.*)', sources).stdout().strip().split()
+ foreach src: pmdinfogen_srcs
+ out_filename = '@0@.pmd.c'.format(src.split('/')[-1])
+ tmp_lib = static_library('tmp_@0@'.format(src.underscorify()),
+ src, include_directories: includes,
+ dependencies: dep_objs,
+ c_args: cflags)
+ sources += custom_target(out_filename,
+ command: [pmdinfo, tmp_lib.full_path(),
+ '@OUTPUT@', pmdinfogen],
+ output: out_filename,
+ depends: [pmdinfogen, tmp_lib])
+ endforeach
- # create a dependency object and add it to the global dictionary so
- # testpmd or other built-in apps can find it if necessary
- set_variable('dep_rte_pmd_@0@'.format(drv),
- declare_dependency(link_with: lib,
+ # now build the driver itself, and add to the drivers list
+ drv_name = 'rte_pmd_@0@'.format(drv)
+ version_map = '@0@/@1@/rte_pmd_@1@_version.map'.format(
+ meson.current_source_dir(), drv)
+ lib = library(drv_name,
+ sources,
+ objects: objs,
include_directories: includes,
- dependencies: dep_objs))
+ dependencies: dep_objs,
+ c_args: cflags,
+ link_args: '-Wl,--version-script=' + version_map,
+ link_depends: version_map,
+ version: '@0@.1'.format(version),
+ install: true,
+ install_dir: driver_install_path)
+
+ dpdk_drivers += lib
+
+ # create a dependency object and add it to the global dictionary so
+ # testpmd or other built-in apps can find it if necessary
+ set_variable('dep_rte_pmd_@0@'.format(drv),
+ declare_dependency(link_with: lib,
+ include_directories: includes,
+ dependencies: dep_objs))
+ endif # build
endforeach
@@ -29,10 +29,13 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-sources = files('rte_eth_pcap.c')
-
-if pcap_dep.found()
+pcap_dep = dependency('pcap', required: false)
+if pcap_dep.found() == true
ext_deps += pcap_dep
-else
+elif find_program('pcap-config', required: false).found() == true
ext_deps += cc.find_library('pcap')
+else
+ build = false
endif
+sources = files('rte_eth_pcap.c')
+pkgconfig_extra_libs += '-lpcap'
@@ -58,7 +58,8 @@ eal_lib = library('rte_eal', sources, eal_common_sources, eal_common_arch_source
install: true
)
-dpdk_libraries += [eal_lib, '-pthread', eal_extra_link_arg]
+dpdk_libraries += eal_lib
+dpdk_extra_ldflags += ['-pthread', eal_extra_link_arg]
rte_eal = declare_dependency(link_with: eal_lib,
include_directories: eal_inc,
@@ -41,6 +41,7 @@ install_headers(
'rte_io.h',
'rte_memcpy.h',
'rte_prefetch.h',
+ 'rte_pause.h',
'rte_rtm.h',
'rte_rwlock.h',
'rte_spinlock.h',
@@ -63,7 +63,8 @@ eal_lib = library('rte_eal', sources, eal_common_sources, eal_common_arch_source
install: true
)
-dpdk_libraries += [eal_lib, '-pthread', eal_extra_link_arg]
+dpdk_libraries += eal_lib
+dpdk_extra_ldflags += ['-pthread', eal_extra_link_arg]
rte_eal = declare_dependency(link_with: eal_lib,
include_directories: eal_inc,
@@ -41,6 +41,7 @@ cc = meson.get_compiler('c')
dpdk_conf = configuration_data()
dpdk_libraries = []
dpdk_drivers = []
+dpdk_extra_ldflags = []
# for static libs, treat the drivers as regular libraries, otherwise
# for shared libs, put them in a driver folder
@@ -74,7 +75,8 @@ configure_file(output: build_cfg,
# for static builds, include the drivers as libs, and also any
# other dependent libs that DPDK needs to link against
if get_option('default_library') == 'static'
- dpdk_libraries = dpdk_drivers + dpdk_libraries
+ dpdk_drivers = ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive']
+ dpdk_libraries = dpdk_drivers + dpdk_libraries + dpdk_extra_ldflags
endif
pkg = import('pkgconfig')