On Fri, Apr 10, 2020 at 11:04 AM <pbhagavat...@marvell.com> wrote:
>
> From: Pavan Nikhilesh <pbhagavat...@marvell.com>
>
> Remove setting ALLOW_EXPERIMENTAL_API individually for each Makefile and
> meson.build instead enable ALLOW_EXPERIMENTAL_API flag across app, lib and
> drivers.
> This changes reduces the clutter across the project while still maintaining
> the functionality of ALLOW_EXPERIMENTAL_API i.e. warning external
> applications about experimental API usage.
>
> Signed-off-by: Pavan Nikhilesh <pbhagavat...@marvell.com>
> Acked-by: Hemant Agrawal <hemant.agra...@nxp.com>
Little conflict on app/test-fib/Makefile that git-am handles fine (but
Intel CI had trouble with).
> diff --git a/app/test/meson.build b/app/test/meson.build
> index 351d29cb6..013e86715 100644
> --- a/app/test/meson.build
> +++ b/app/test/meson.build
> @@ -393,7 +393,7 @@ dpdk_test = executable('dpdk-test',
> test_sources,
> link_whole: link_libs,
> dependencies: test_dep_objs,
> - c_args: [cflags, '-DALLOW_EXPERIMENTAL_API'],
> + c_args: [cflags, default_cflags],
> install_rpath: driver_install_path,
> install: true)
>
That would pass the flags twice.
I will fix when applying as:
+ c_args: cflags,
> diff --git a/drivers/mempool/octeontx2/Makefile
> b/drivers/mempool/octeontx2/Makefile
> index 337babf66..6af7b5432 100644
> --- a/drivers/mempool/octeontx2/Makefile
> +++ b/drivers/mempool/octeontx2/Makefile
> @@ -32,7 +30,7 @@ EXPORT_MAP := rte_mempool_octeontx2_version.map
> #
> SRCS-$(CONFIG_RTE_LIBRTE_OCTEONTX2_MEMPOOL) += \
> otx2_mempool_ops.c \
> - otx2_mempool.c \
> + otx2_mempool.c \
> otx2_mempool_irq.c \
> otx2_mempool_debug.c
>
> diff --git a/drivers/net/hinic/base/meson.build
> b/drivers/net/hinic/base/meson.build
> index 6cf947f84..0695994ba 100644
> --- a/drivers/net/hinic/base/meson.build
> +++ b/drivers/net/hinic/base/meson.build
> @@ -12,7 +12,7 @@ sources = [
> 'hinic_pmd_niccfg.c',
> 'hinic_pmd_nicio.c',
> 'hinic_pmd_wq.c',
> - 'hinic_pmd_mbox.c',
> + 'hinic_pmd_mbox.c',
> ]
>
> extra_flags = []
> diff --git a/drivers/net/hinic/meson.build b/drivers/net/hinic/meson.build
> index bc7e24639..34ec4af66 100644
> --- a/drivers/net/hinic/meson.build
> +++ b/drivers/net/hinic/meson.build
> @@ -8,7 +8,7 @@ sources = files(
> 'hinic_pmd_ethdev.c',
> 'hinic_pmd_rx.c',
> 'hinic_pmd_tx.c',
> - 'hinic_pmd_flow.c',
> + 'hinic_pmd_flow.c',
> )
>
> includes += include_directories('base')
> diff --git a/lib/librte_gso/meson.build b/lib/librte_gso/meson.build
> index ad8dd8583..af3a63381 100644
> --- a/lib/librte_gso/meson.build
> +++ b/lib/librte_gso/meson.build
> @@ -2,6 +2,6 @@
> # Copyright(c) 2017 Intel Corporation
>
> sources = files('gso_common.c', 'gso_tcp4.c', 'gso_udp4.c',
> - 'gso_tunnel_tcp4.c', 'rte_gso.c')
> + 'gso_tunnel_tcp4.c', 'rte_gso.c')
> headers = files('rte_gso.h')
> deps += ['ethdev']
Whitespace damage, will remove those hunks when applying.
Reviewed-by: David Marchand <david.march...@redhat.com>
Thanks.
--
David Marchand
