mbuf: extend meaning of QinQ stripped bit

[dpdk.git] / meson.build

diff --git a/meson.build b/meson.build
index 0dd0e2d..61d9a4f 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,10 +1,11 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2017 Intel Corporation
+# Copyright(c) 2017-2019 Intel Corporation
 
 project('DPDK', 'C',
        # Get version number from file.
-       # Use "more" rather than "cat" for windows compatibility.
-       version: run_command('more', files('VERSION')).stdout().strip(),
+       # Fallback to "more" for Windows compatibility.
+       version: run_command(find_program('cat', 'more'),
+               files('VERSION')).stdout().strip(),
        license: 'BSD',
        default_options: ['buildtype=release', 'default_library=static'],
        meson_version: '>= 0.47.1'
@@ -18,29 +19,34 @@ dpdk_static_libraries = []
 dpdk_driver_classes = []
 dpdk_drivers = []
 dpdk_extra_ldflags = []
-dpdk_app_link_libraries = []
-
-# set the major version, which might be used by drivers and libraries
-# depending on the configuration options
-pver = meson.project_version().split('.')
-major_version = '@0@.@1@'.format(pver.get(0), pver.get(1))
-
-pmd_subdir_opt = get_option('drivers_install_subdir')
-if pmd_subdir_opt.contains('<VERSION>')
-       pmd_subdir_opt = major_version.join(pmd_subdir_opt.split('<VERSION>'))
+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
-driver_install_path = join_paths(get_option('libdir'), pmd_subdir_opt)
-eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
 
 # 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/common/include')
+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),
+)
+
+# do configuration and get tool paths
+subdir('buildtools')
 subdir('config')
 
 # build libs and drivers
+subdir('buildtools/pmdinfogen')
 subdir('lib')
-subdir('buildtools')
 subdir('drivers')
 
 # build binaries and installable tools
@@ -50,10 +56,9 @@ subdir('app')
 # build docs
 subdir('doc')
 
-# build any examples explicitly requested - useful for developers
-if get_option('examples') != ''
-       subdir('examples')
-endif
+# build any examples explicitly requested - useful for developers - and
+# install any example code into the appropriate install path
+subdir('examples')
 
 # build kernel modules if enabled
 if get_option('enable_kmods')
@@ -67,30 +72,8 @@ configure_file(output: build_cfg,
                install_dir: join_paths(get_option('includedir'),
                                get_option('include_subdir_arch')))
 
-# for static builds, include the drivers as libs and we need to "whole-archive"
-# them.
-dpdk_drivers = ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive']
-
-# driver .so files often depend upon the bus drivers for their connect bus,
-# e.g. ixgbe depends on librte_bus_pci. This means that the bus drivers need
-# to be in the library path, so symlink the drivers from the main lib directory.
-meson.add_install_script('buildtools/symlink-drivers-solibs.sh',
-               driver_install_path,
-               get_option('libdir'))
-
-pkg = import('pkgconfig')
-pkg.generate(name: meson.project_name(),
-       filebase: 'lib' + meson.project_name().to_lower(),
-       version: meson.project_version(),
-       libraries: dpdk_libraries,
-       libraries_private: dpdk_drivers + dpdk_static_libraries +
-                       ['-Wl,-Bdynamic'] + dpdk_extra_ldflags,
-       description: '''The Data Plane Development Kit (DPDK).
-Note that CFLAGS might contain an -march flag higher than typical baseline.
-This is required for a number of static inline functions in the public headers.''',
-       subdirs: [get_option('include_subdir_arch'), '.'],
-       extra_cflags: ['-include', 'rte_config.h'] + machine_args
-)
+# build pkg-config files for dpdk
+subdir('buildtools/pkg-config')
 
 # final output, list all the libs and drivers to be built
 # this does not affect any part of the build, for information only.
@@ -122,3 +105,16 @@ foreach class:dpdk_driver_classes
        endforeach
 endforeach
 message(output_message + '\n')
+
+output_message = '\n=================\nContent Skipped\n=================\n'
+output_message += '\nlibs:\n\t'
+foreach lib:dpdk_libs_disabled
+       reason = get_variable(lib.underscorify() + '_disable_reason')
+       output_message += lib + ':\t' + reason + '\n\t'
+endforeach
+output_message += '\ndrivers:\n\t'
+foreach drv:dpdk_drvs_disabled
+       reason = get_variable(drv.underscorify() + '_disable_reason')
+       output_message += drv + ':\t' + reason + '\n\t'
+endforeach
+message(output_message + '\n')