[dpdk-stable] [PATCH] eal: move compat includes to common meson file

[Anatoly Burakov]

Currently, while EAL does depend on librte_compat as far as common
meson build is concerned, for some reason the headers for that
library are not added into the list of includes. This is fixed in
Linuxapp-specific meson file, but is absent from FreeBSD meson file.

This worked fine up until recently, when an rte_compat dependency
was added to rte_log, which is a common header. Fix this issue by
adding librte_compat includes to common EAL meson file.

Fixes: 844514c73569 ("eal: build with meson")
Fixes: a8499f65a1d1 ("log: add missing experimental tag")
Cc: bruce.richardson at intel.com
Cc: david.marchand at redhat.com
Cc: stable at dpdk.org

Signed-off-by: Anatoly Burakov <anatoly.burakov at intel.com>
---
 lib/librte_eal/linuxapp/eal/meson.build | 2 +-
 lib/librte_eal/meson.build              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/meson.build b/lib/librte_eal/linuxapp/eal/meson.build
index 6e31c2aaa..7e68b2c0d 100644
--- a/lib/librte_eal/linuxapp/eal/meson.build
+++ b/lib/librte_eal/linuxapp/eal/meson.build
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-eal_inc += include_directories('include', '../../../librte_compat')
+eal_inc += include_directories('include')
 install_subdir('include/exec-env', install_dir: get_option('includedir'))
 
 env_objs = []
diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build
index a18f3a826..67e26de8d 100644
--- a/lib/librte_eal/meson.build
+++ b/lib/librte_eal/meson.build
@@ -4,7 +4,7 @@
 # Custom EAL processing. EAL is complicated enough that it can't just
 # have a straight list of headers and source files.
 # Initially pull in common settings
-eal_inc = [global_inc]
+eal_inc = [global_inc, include_directories('../librte_compat')]
 subdir('common') # defines common_sources, common_objs, etc.
 
 # Now do OS/exec-env specific settings, including building kernel modules
-- 
2.17.1