build: add arch-specific header path to global includes

The global include path, which is used by anything built before EAL,
points to the EAL header files so they utility macros etc. can be used
anywhere in DPDK. This path included the OS-specific EAL header files,
but not the architecture-specific ones. This patch moves the selection
of target architecture to the top-level meson.build file so that the
global include can reference that.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Reviewed-by: Keith Wiles <keith.wiles@intel.com>

diff --git a/config/meson.build b/config/meson.build
index e851b407b215818315690b00100d40fb85235585..a1c38c053eae38a75f5db92922a447fe54f4ff60 100644 (file)
--- a/config/meson.build
+++ b/config/meson.build
@@ -237,13 +237,6 @@ dpdk_conf.set('RTE_LIBRTE_DPAA2_USE_PHYS_IOVA', true)
 
 
 compile_time_cpuflags = []
-if host_machine.cpu_family().startswith('x86')
-       arch_subdir = 'x86'
-elif host_machine.cpu_family().startswith('arm') or host_machine.cpu_family().startswith('aarch')
-       arch_subdir = 'arm'
-elif host_machine.cpu_family().startswith('ppc')
-       arch_subdir = 'ppc'
-endif
 subdir(arch_subdir)
 dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags))
 

diff --git a/lib/librte_eal/arm/include/meson.build b/lib/librte_eal/arm/include/meson.build
index 1721743240e63aff7ff43c4753e834c3fb5d3bd6..73b750a18f401a7e3b769a5b6b04fcd2a8f6e67e 100644 (file)
--- a/lib/librte_eal/arm/include/meson.build
+++ b/lib/librte_eal/arm/include/meson.build
@@ -1,8 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation.
 
-includes += include_directories('.')
-
 arch_headers = files(
        'rte_atomic_32.h',
        'rte_atomic_64.h',

diff --git a/lib/librte_eal/ppc/include/meson.build b/lib/librte_eal/ppc/include/meson.build
index 3ee38f6940eb74809f328bbf61a640cf9abb7e92..ab4bd28092bc127d82caf60f5e2a6bc4307c855d 100644 (file)
--- a/lib/librte_eal/ppc/include/meson.build
+++ b/lib/librte_eal/ppc/include/meson.build
@@ -1,8 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
 
-includes += include_directories('.')
-
 arch_headers = files(
        'rte_altivec.h',
        'rte_atomic.h',

diff --git a/lib/librte_eal/x86/include/meson.build b/lib/librte_eal/x86/include/meson.build
index d336d522c03edfc5874bc27b79c8a2d48e7c4756..f0e998c2fe08c2a8abba10f069dad54ff9fd5377 100644 (file)
--- a/lib/librte_eal/x86/include/meson.build
+++ b/lib/librte_eal/x86/include/meson.build
@@ -1,8 +1,6 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-includes += include_directories('.')
-
 arch_headers = files(
        'rte_atomic_32.h',
        'rte_atomic_64.h',

diff --git a/meson.build b/meson.build
index 269ba9614cdd36c29d542ab996920a0c951014d9..750fdeab1742f271c6d493bc1d773705925aa0dd 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -25,12 +25,21 @@ dpdk_libs_disabled = []
 dpdk_drvs_disabled = []
 abi_version_file = files('ABI_VERSION')
 
+if host_machine.cpu_family().startswith('x86')
+       arch_subdir = 'x86'
+elif host_machine.cpu_family().startswith('arm') or host_machine.cpu_family().startswith('aarch')
+       arch_subdir = 'arm'
+elif host_machine.cpu_family().startswith('ppc')
+       arch_subdir = 'ppc'
+endif
+
 # configure the build, and make sure configs here and in config folder are
 # able to be included in any file. We also store a global array of include dirs
 # for passing to pmdinfogen scripts
 global_inc = include_directories('.', 'config',
        'lib/librte_eal/include',
        'lib/librte_eal/@0@/include'.format(host_machine.system()),
+       'lib/librte_eal/@0@/include'.format(arch_subdir),
 )
 subdir('config')