kvargs: fix building with meson outside source tree
authorBruce Richardson <bruce.richardson@intel.com>
Thu, 19 Jul 2018 14:26:48 +0000 (15:26 +0100)
committerThomas Monjalon <thomas@monjalon.net>
Thu, 26 Jul 2018 08:14:06 +0000 (10:14 +0200)
When building DPDK with meson with the <builddir> being outside the source
directory, an error was generated as the path to the EAL headers was not
found. The path specified for the includes backed out unnecessarily far and
so broke when the build directory was not in the expected location of
just inside the source dir. Changing the path to be shorter, just going
down one level and then into EAL builds for both cases - where builddir is
in source directory, and also when it's outside it.

Fixes: 092ee516496d ("kvargs: build before EAL")

Reported-by: Anatoly Burakov <anatoly.burakov@intel.com>
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Tested-by: Anatoly Burakov <anatoly.burakov@intel.com>
lib/librte_kvargs/meson.build

index a1c7249..acd3e54 100644 (file)
@@ -2,7 +2,7 @@
 # Copyright(c) 2017 Intel Corporation
 
 includes = [global_inc]
-includes += include_directories('../../../lib/librte_eal/common/include')
+includes += include_directories('../librte_eal/common/include')
 
 version = 1
 sources = files('rte_kvargs.c')