[dpdk-dev] [PATCH v2 6/8] eal: move common header files

[David Marchand]

On Fri, Mar 27, 2020 at 2:17 AM Thomas Monjalon <thomas at monjalon.net> wrote:
>
> The EAL API (with doxygen documentation) is moved from
> common/include/ to include/, which makes more clear that
> it is the global API for all environments and architectures.
>
> Note that the arch-specific and OS-specific include files are not
> in this global include directory, but include/generic/ should
> cover the doxygen documentation for them.
>
> Signed-off-by: Thomas Monjalon <thomas at monjalon.net>

This patch breaks the installation of common headers with meson, hence
breaking the compilation of external applications (like examples).

[snip]

> diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build
> index 1fc532139b..a433f46ade 100644
> --- a/lib/librte_eal/meson.build
> +++ b/lib/librte_eal/meson.build
> @@ -5,6 +5,8 @@
>  # have a straight list of headers and source files.
>  # Initially pull in common settings
>  eal_inc = [global_inc]
> +subdir('include')
> +
>  subdir('common')
>
>  # Now do OS/exec-env specific settings, including building kernel modules
> @@ -27,5 +29,5 @@ if cc.has_header('getopt.h')
>  endif
>  sources += env_sources
>  objs = env_objs
> -headers = common_headers + env_headers
> +headers = env_headers
>  includes += eal_inc

Works with fix:

diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build
index a433f46ad..23ae03ad4 100644
--- a/lib/librte_eal/meson.build
+++ b/lib/librte_eal/meson.build
@@ -29,5 +29,5 @@ if cc.has_header('getopt.h')
 endif
 sources += env_sources
 objs = env_objs
-headers = env_headers
+headers += env_headers
 includes += eal_inc



-- 
David Marchand