d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
33cd3fd52f
numam-dpdk/lib/metrics/meson.build

14 lines
393 B
Meson
Raw Normal View History

build: replace license text with SPDX tag Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> Reviewed-by: Luca Boccassi <bluca@debian.org>
2017-12-18 15:56:25 +00:00
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017 Intel Corporation
lib: build with meson Add non-EAL libraries to DPDK build. The compat lib is a special case, along with the previously-added EAL, but all other libs can be build using the same set of commands, where the individual meson.build files only need to specify their dependencies, source files, header files and ABI versions. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> Reviewed-by: Harry van Haaren <harry.van.haaren@intel.com> Acked-by: Keith Wiles <keith.wiles@intel.com> Acked-by: Luca Boccassi <luca.boccassi@gmail.com>
2017-10-17 12:43:57 +00:00
metrics: export telemetry stubs if no libjansson This patch allows the same set of rte_metrics_tel_* functions to be exported no matter JANSSON is available or not, by doing following: 1. Leverage dpdk_conf to set configuration flag RTE_HAS_JANSSON when Jansson dependency is found. 2. In rte_metrics_telemetry.c, leverage RTE_HAS_JANSSON to handle the case when JANSSON is not available by adding stubs for all the instances. 3. In meson.build, per dpdk/doc/guides/rel_notes/release_20_05.rst, it is claimed that "Telemetry library is no longer dependent on the external Jansson library, which allows Telemetry be enabled by default.", thus make the deps and includes of Telemetry as not conditional anymore. Signed-off-by: Jie Zhou <jizh@microsoft.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
2021-03-08 18:05:39 +00:00
sources = files('rte_metrics.c', 'rte_metrics_telemetry.c')
headers = files('rte_metrics.h', 'rte_metrics_telemetry.h')
telemetry: move some functions to metrics library This commit moves some of the telemetry library code to a new file in the metrics library. No modifications are made to the moved code, except what is needed to allow it to compile and run. The additional code in metrics is built only when the Jansson library is present. Telemetry functions as normal, using the functions from the metrics_telemetry file. This move will enable code be reused by the new version of telemetry in a later commit, to support backward compatibility with the existing telemetry usage. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Keith Wiles <keith.wiles@intel.com>
2020-04-30 16:01:21 +00:00
build: force pkg-config for dependency detection Meson can use cmake as a fallback for detecting packages, and this can lead to picking up 64-libs for 32-bit builds. To work around this, force the use of pkg-config only for detecting libcrypto, zlib, jansson and other package dependencies. Cc: stable@dpdk.org Signed-off-by: Bruce Richardson <bruce.richardson@intel.com> Tested-by: Ruifeng Wang <ruifeng.wang@arm.com> Tested-by: Liron Himi <lironh@marvell.com> Tested-by: Lee Daly <lee.daly@intel.com> Tested-by: Hemant Agrawal <hemant.agrawal@nxp.com> Tested-by: Martin Spinler <spinler@cesnet.cz>
2021-01-18 14:29:57 +00:00
jansson = dependency('jansson', required: false, method: 'pkg-config')
telemetry: move some functions to metrics library This commit moves some of the telemetry library code to a new file in the metrics library. No modifications are made to the moved code, except what is needed to allow it to compile and run. The additional code in metrics is built only when the Jansson library is present. Telemetry functions as normal, using the functions from the metrics_telemetry file. This move will enable code be reused by the new version of telemetry in a later commit, to support backward compatibility with the existing telemetry usage. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Keith Wiles <keith.wiles@intel.com>
2020-04-30 16:01:21 +00:00
if jansson.found()
lib: clean up build files Switch from using tabs to 4 spaces for meson.build indentation. Perform other formatting cleanups such as ensure that long lists of files are one per line, and terminating with a final comma before the closing brace to make addition/removals easier. In some cases, reorder lists of items where they were not in alphabetical order. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
2021-04-20 10:22:24 +00:00
dpdk_conf.set('RTE_HAS_JANSSON', 1)
ext_deps += jansson
telemetry: move some functions to metrics library This commit moves some of the telemetry library code to a new file in the metrics library. No modifications are made to the moved code, except what is needed to allow it to compile and run. The additional code in metrics is built only when the Jansson library is present. Telemetry functions as normal, using the functions from the metrics_telemetry file. This move will enable code be reused by the new version of telemetry in a later commit, to support backward compatibility with the existing telemetry usage. Signed-off-by: Ciara Power <ciara.power@intel.com> Reviewed-by: Keith Wiles <keith.wiles@intel.com>
2020-04-30 16:01:21 +00:00
endif
metrics: export telemetry stubs if no libjansson This patch allows the same set of rte_metrics_tel_* functions to be exported no matter JANSSON is available or not, by doing following: 1. Leverage dpdk_conf to set configuration flag RTE_HAS_JANSSON when Jansson dependency is found. 2. In rte_metrics_telemetry.c, leverage RTE_HAS_JANSSON to handle the case when JANSSON is not available by adding stubs for all the instances. 3. In meson.build, per dpdk/doc/guides/rel_notes/release_20_05.rst, it is claimed that "Telemetry library is no longer dependent on the external Jansson library, which allows Telemetry be enabled by default.", thus make the deps and includes of Telemetry as not conditional anymore. Signed-off-by: Jie Zhou <jizh@microsoft.com> Acked-by: Bruce Richardson <bruce.richardson@intel.com> Acked-by: Dmitry Kozlyuk <dmitry.kozliuk@gmail.com>
2021-03-08 18:05:39 +00:00
deps += ['ethdev', 'telemetry']
Reference in New Issue Copy Permalink