> -----Original Message-----
> From: Yang, SteveX <stevex.y...@intel.com>
> Sent: Friday, September 11, 2020 13:58
> To: dev@dpdk.org
> Cc: Richardson, Bruce <bruce.richard...@intel.com>; Lu, Wenzhuo
> <wenzhuo...@intel.com>; Xing, Beilei <beilei.x...@intel.com>; Yang, Qiming
> <qiming.y...@intel.com>; Yang, SteveX <stevex.y...@intel.com>
> Subject: [PATCH v2] app/test-pmd: fix meson build failed when enabled
> pmd_bonded
>
> The depended pmd bond is missing for test-pmd. Add the pmd_bond to
> deps, and replace the relative MACRO name with new
> RTE_LIBRTE_BOND_PMD.
>
> Signed-off-by: SteveX Yang <stevex.y...@intel.com>
Fix line miss
> ---
> v1->v2:
> * replaced the bond pmd MACRO with the new one;
> * removed header paths cflags of bond pmd;
> ---
> app/test-pmd/cmdline.c | 10 +++++-----
> app/test-pmd/meson.build | 3 +++
> app/test-pmd/parameters.c | 2 +-
> 3 files changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index
> 0f33948e8..4ddc557af 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -50,7 +50,7 @@
> #include <cmdline_parse_etheraddr.h>
> #include <cmdline_socket.h>
> #include <cmdline.h>
> -#ifdef RTE_LIBRTE_PMD_BOND
> +#ifdef RTE_LIBRTE_BOND_PMD
> #include <rte_eth_bond.h>
> #include <rte_eth_bond_8023ad.h>
> #endif
> @@ -603,7 +603,7 @@ static void cmd_help_long_parsed(void
> *parsed_result,
> " Show the bypass configuration for a bypass
> enabled NIC"
> " using the lowest port on the NIC.\n\n"
>
> -#ifdef RTE_LIBRTE_PMD_BOND
> +#ifdef RTE_LIBRTE_BOND_PMD
> "create bonded device (mode) (socket)\n"
> " Create a new bonded device with specific
> bonding mode and socket.\n\n"
>
> @@ -5738,7 +5738,7 @@ cmdline_parse_inst_t cmd_show_bypass_config =
> {
> },
> };
>
> -#ifdef RTE_LIBRTE_PMD_BOND
> +#ifdef RTE_LIBRTE_BOND_PMD
> /* *** SET BONDING MODE *** */
> struct cmd_set_bonding_mode_result {
> cmdline_fixed_string_t set;
> @@ -6508,7 +6508,7 @@ cmdline_parse_inst_t
> cmd_set_bonding_agg_mode_policy = { };
>
>
> -#endif /* RTE_LIBRTE_PMD_BOND */
> +#endif /* RTE_LIBRTE_BOND_PMD */
>
> /* *** SET FORWARDING MODE *** */
> struct cmd_set_fwd_mode_result {
> @@ -19520,7 +19520,7 @@ cmdline_parse_ctx_t main_ctx[] = {
> (cmdline_parse_inst_t *)&cmd_set_bypass_event,
> (cmdline_parse_inst_t *)&cmd_set_bypass_timeout,
> (cmdline_parse_inst_t *)&cmd_show_bypass_config, -#ifdef
> RTE_LIBRTE_PMD_BOND
> +#ifdef RTE_LIBRTE_BOND_PMD
> (cmdline_parse_inst_t *) &cmd_set_bonding_mode,
> (cmdline_parse_inst_t *) &cmd_show_bonding_config,
> (cmdline_parse_inst_t *) &cmd_set_bonding_primary, diff --git
> a/app/test-pmd/meson.build b/app/test-pmd/meson.build index
> ea56e547b..7ad87d010 100644
> --- a/app/test-pmd/meson.build
> +++ b/app/test-pmd/meson.build
> @@ -25,6 +25,9 @@ sources = files('5tswap.c',
> 'util.c')
>
> deps += ['ethdev', 'gro', 'gso', 'cmdline', 'metrics', 'meter', 'bus_pci']
> +if dpdk_conf.has('RTE_LIBRTE_BOND_PMD')
> + deps += 'pmd_bond'
> +endif
> if dpdk_conf.has('RTE_LIBRTE_PDUMP')
> deps += 'pdump'
> endif
> diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index
> 784515314..6402c9c12 100644
> --- a/app/test-pmd/parameters.c
> +++ b/app/test-pmd/parameters.c
> @@ -39,7 +39,7 @@
> #include <rte_ether.h>
> #include <rte_ethdev.h>
> #include <rte_string_fns.h>
> -#ifdef RTE_LIBRTE_PMD_BOND
> +#ifdef RTE_LIBRTE_BOND_PMD
> #include <rte_eth_bond.h>
> #endif
> #include <rte_flow.h>
> --
> 2.17.1
