build: remove compatibility build defines
Subsystems (7)
PATCH 1/1 build: remove compatibility build defines
As announced in the deprecation note, remove all compatibility build defines from previous make/meson versions and use only the standardized ones - RTE_LIB_<name> for libraries, and RTE_<CLASS>_<NAME> for drivers.
--- config/meson.build | 2 +- config/rte_compatibility_defines.h | 129 -------------------------- config/rte_config.h | 1 - doc/guides/rel_notes/deprecation.rst | 8 -- drivers/baseband/meson.build | 2 - drivers/bus/meson.build | 1 - drivers/common/meson.build | 1 - drivers/common/mlx5/meson.build | 1 - drivers/common/qat/meson.build | 2 - drivers/compress/meson.build | 1 - drivers/compress/octeontx/meson.build | 1 - drivers/crypto/meson.build | 1 - drivers/crypto/null/meson.build | 1 - drivers/crypto/octeontx/meson.build | 1 - drivers/crypto/octeontx2/meson.build | 1 - drivers/crypto/scheduler/meson.build | 1 - drivers/crypto/virtio/meson.build | 1 - drivers/event/meson.build | 1 - drivers/mempool/meson.build | 1 - drivers/meson.build | 23 ----- drivers/net/meson.build | 1 - drivers/raw/meson.build | 1 - drivers/regex/meson.build | 1 - drivers/regex/mlx5/meson.build | 1 - drivers/regex/octeontx2/meson.build | 1 - drivers/vdpa/meson.build | 1 - drivers/vdpa/mlx5/meson.build | 1 - lib/meson.build | 3 +- 28 files changed, 2 insertions(+), 188 deletions(-) delete mode 100644 config/rte_compatibility_defines.h
config/meson.build +1 -1
@@ -256,7 +256,7 @@ dpdk_conf.set('RTE_COMPILE_TIME_CPUFLAGS', ','.join(compile_time_cpuflags)) # set the install path for the drivers dpdk_conf.set_quoted('RTE_EAL_PMD_PATH', eal_pmd_path) -install_headers(['rte_config.h', 'rte_compatibility_defines.h'], +install_headers(['rte_config.h'], subdir: get_option('include_subdir_arch')) # enable VFIO only if it is linux OS
config/rte_compatibility_defines.h deleted +0 -129
129 lines not on this page · raw message
config/rte_config.h +0 -1
@@ -13,7 +13,6 @@#define _RTE_CONFIG_H_#include <rte_build_config.h> -#include "rte_compatibility_defines.h" /* legacy defines */ #ifdef RTE_EXEC_ENV_LINUX
doc/guides/rel_notes/deprecation.rst +0 -8
@@ -11,14 +11,6 @@ here. Deprecation Notices ------------------- -* build: The macros defined to indicate which DPDK libraries and drivers - are included in the meson build are changing to a standardized format of - ``RTE_LIB_<NAME>`` and ``RTE_<CLASS>_<NAME>``, where ``NAME`` is the - upper-case component name, e.g. EAL, ETHDEV, IXGBE, and ``CLASS`` is the - upper-case name of the device class to which a driver belongs e.g. - ``NET``, ``CRYPTO``, ``VDPA``. The old macros are deprecated and will be - removed in a future release. - * kvargs: The function ``rte_kvargs_process`` will get a new parameter for returning key match count. It will ease handling of no-match case.
drivers/baseband/meson.build +0 -2
@@ -6,5 +6,3 @@ if is_windows endif drivers = ['null', 'turbo_sw', 'fpga_lte_fec', 'fpga_5gnr_fec', 'acc100'] - -config_flag_fmt = 'RTE_LIBRTE_PMD_BBDEV_@0@'
drivers/bus/meson.build +0 -1
@@ -3,4 +3,3 @@ drivers = ['dpaa', 'fslmc', 'ifpga', 'pci', 'vdev', 'vmbus'] std_deps = ['eal'] -config_flag_fmt = 'RTE_LIBRTE_@0@_BUS'
drivers/common/meson.build +0 -1
@@ -7,4 +7,3 @@ endif std_deps = ['eal'] drivers = ['cpt', 'dpaax', 'iavf', 'mvep', 'octeontx', 'octeontx2', 'sfc_efx'] -config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON'
drivers/common/mlx5/meson.build +0 -1
@@ -7,7 +7,6 @@ if not is_linux subdir_done() endif -config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON' deps += ['hash', 'pci', 'bus_pci', 'net', 'eal', 'kvargs'] sources += files( 'mlx5_devx_cmds.c',
drivers/common/qat/meson.build +0 -2
@@ -1,8 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2018 Intel Corporation -config_flag_fmt = 'RTE_LIBRTE_@0@_COMMON' - qat_crypto = true qat_crypto_path = 'crypto/qat' qat_crypto_relpath = '../../' + qat_crypto_path
drivers/compress/meson.build +0 -1
@@ -8,4 +8,3 @@ endif drivers = ['isal', 'octeontx', 'zlib'] std_deps = ['compressdev'] # compressdev pulls in all other needed deps -config_flag_fmt = 'RTE_LIBRTE_PMD_@0@'
drivers/compress/octeontx/meson.build +0 -1
@@ -1,7 +1,6 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Cavium, Inc -fmt_name = 'octeontx_compress' sources = files('otx_zip.c', 'otx_zip_pmd.c') includes += include_directories('include') deps += ['mempool_octeontx', 'bus_pci']
drivers/crypto/meson.build +0 -1
@@ -26,4 +26,3 @@ drivers = ['aesni_gcm', 'zuc'] std_deps = ['cryptodev'] # cryptodev pulls in all other needed deps -config_flag_fmt = 'RTE_LIBRTE_PMD_@0@'
drivers/crypto/null/meson.build +0 -1
@@ -2,5 +2,4 @@ # Copyright(c) 2017 Intel Corporation deps += 'bus_vdev' -fmt_name = 'null_crypto' sources = files('null_crypto_pmd.c', 'null_crypto_pmd_ops.c')
drivers/crypto/octeontx/meson.build +0 -1
@@ -7,7 +7,6 @@ endif deps += ['bus_pci'] deps += ['common_cpt'] -fmt_name = 'octeontx_crypto' sources = files('otx_cryptodev.c', 'otx_cryptodev_capabilities.c',
drivers/crypto/octeontx2/meson.build +0 -1
@@ -13,7 +13,6 @@ deps += ['common_octeontx2'] deps += ['ethdev'] deps += ['eventdev'] deps += ['security'] -fmt_name = 'octeontx2_crypto' sources = files('otx2_cryptodev.c', 'otx2_cryptodev_capabilities.c',
drivers/crypto/scheduler/meson.build +0 -1
@@ -2,7 +2,6 @@ # Copyright(c) 2018 Luca Boccassi <[email protected]> deps += ['bus_vdev', 'reorder'] -fmt_name = 'crypto_scheduler' sources = files( 'rte_cryptodev_scheduler.c', 'scheduler_failover.c',
drivers/crypto/virtio/meson.build +0 -1
@@ -3,6 +3,5 @@ includes += include_directories('../../../lib/librte_vhost') deps += 'bus_pci' -fmt_name = 'virtio_crypto' sources = files('virtio_cryptodev.c', 'virtio_pci.c', 'virtio_rxtx.c', 'virtqueue.c')
drivers/event/meson.build +0 -1
@@ -12,4 +12,3 @@ if not (toolchain == 'gcc' and cc.version().version_compare('<4.8.6') and drivers += 'octeontx' endif std_deps = ['eventdev', 'kvargs'] -config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_EVENTDEV'
drivers/mempool/meson.build +0 -1
@@ -3,4 +3,3 @@ drivers = ['bucket', 'dpaa', 'dpaa2', 'octeontx', 'octeontx2', 'ring', 'stack'] std_deps = ['mempool'] -config_flag_fmt = 'RTE_LIBRTE_@0@_MEMPOOL'
drivers/meson.build +0 -23
@@ -32,7 +32,6 @@ endif foreach subpath:subdirs drivers = [] std_deps = [] - config_flag_fmt = '' # format string used to set the value in dpdk_conf # subpath can be either "class" or "class/driver" if subpath.contains('/')
@@ -58,7 +57,6 @@ foreach subpath:subdirs build = true # set to false to disable, e.g. missing deps reason = '<unknown reason>' # set if build == false to explain name = drv - fmt_name = '' sources = [] headers = [] objs = []
@@ -114,27 +112,6 @@ foreach subpath:subdirs lib_name = '_'.join(['rte', class, name]) dpdk_conf.set(lib_name.to_upper(), 1) - if fmt_name == '' - fmt_name = name - endif - - dpdk_conf.set(config_flag_fmt.format(fmt_name.to_upper()),1) #old-style macro - # for driver compatibility, since we changed the - # default to match that of make. Remove in future release - # after following deprecation process - if config_flag_fmt.contains('_PMD_@0@') and (class == 'crypto' - or class == 'compress' - or class == 'event') - alt_flag_fmt = '_@0@_PMD'.join( - config_flag_fmt.split('_PMD_@0@')) - if config_flag_fmt.contains('EVENTDEV') - alt_flag_fmt = '_@0@_EVENTDEV_PMD'.join( - config_flag_fmt.split('_PMD_@0@_EVENTDEV')) - endif - dpdk_conf.set(alt_flag_fmt.format( - fmt_name.to_upper()), 1) - endif - dpdk_extra_ldflags += pkgconfig_extra_libs install_headers(headers)
drivers/net/meson.build +0 -1
@@ -59,4 +59,3 @@ drivers = ['af_packet', std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std std_deps += ['bus_vdev'] # same with vdev bus -config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
drivers/raw/meson.build +0 -1
@@ -11,4 +11,3 @@ drivers = ['dpaa2_cmdif', 'dpaa2_qdma', 'octeontx2_ep', 'skeleton'] std_deps = ['rawdev'] -config_flag_fmt = 'RTE_LIBRTE_PMD_@0@_RAWDEV'
drivers/regex/meson.build +0 -1
@@ -3,4 +3,3 @@ drivers = ['mlx5', 'octeontx2'] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc -config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
drivers/regex/mlx5/meson.build +0 -1
@@ -7,7 +7,6 @@ if not is_linux subdir_done() endif -fmt_name = 'mlx5_regex' deps += ['common_mlx5', 'eal', 'regexdev'] sources = files( 'mlx5_regex.c',
drivers/regex/octeontx2/meson.build +0 -1
@@ -22,7 +22,6 @@ sources = files('otx2_regexdev.c', 'otx2_regexdev_compiler.c' ) -fmt_name = 'octeontx2_regex' deps += ['bus_pci', 'common_octeontx2', 'regexdev'] includes += include_directories('../../common/octeontx2')
drivers/vdpa/meson.build +0 -1
@@ -9,4 +9,3 @@ drivers = ['ifc', 'mlx5',] std_deps = ['bus_pci', 'kvargs'] std_deps += ['vhost'] -config_flag_fmt = 'RTE_LIBRTE_@0@_PMD'
drivers/vdpa/mlx5/meson.build +0 -1
@@ -7,7 +7,6 @@ if not is_linux subdir_done() endif -fmt_name = 'mlx5_vdpa' deps += ['hash', 'common_mlx5', 'vhost', 'pci', 'eal', 'sched'] sources = files( 'mlx5_vdpa.c',
lib/meson.build +1 -2
@@ -100,8 +100,7 @@ foreach l:libraries set_variable(name.underscorify() + '_disable_reason', reason) else enabled_libs += name - dpdk_conf.set('RTE_LIBRTE_' + name.to_upper(), 1) #old macro - dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1) # new macro + dpdk_conf.set('RTE_LIB_' + name.to_upper(), 1) install_headers(headers) libname = 'rte_' + name
Signature · 1 line
2.27.0
09/12/2020 18:14, Bruce Richardson:
Quoted 5 lines
As announced in the deprecation note, remove all compatibility build defines from previous make/meson versions and use only the standardized ones - RTE_LIB_<name> for libraries, and RTE_<CLASS>_<NAME> for drivers.
Signed-off-by Bruce Richardson <[email protected]>
Applied with a note in the API release notes:
* config: Removed the old macros, included in ``rte_config.h``, to indicate which DPDK libraries and drivers are built.
The new macros are generated by meson in a standardized format:
``RTE_LIB_<NAME>`` and ``RTE_<CLASS>_<NAME>``, where ``NAME`` is the upper-case component name, e.g. ``EAL``, ``ETHDEV``, ``VIRTIO``, and ``CLASS`` is the upper-case driver class, e.g. ``NET``, ``CRYPTO``.
Quoted 7 lines · Thomas Monjalon
09/12/2020 18:14, Bruce Richardson:
Quoted 5 lines
As announced in the deprecation note, remove all compatibility build defines from previous make/meson versions and use only the standardized ones - RTE_LIB_<name> for libraries, and RTE_<CLASS>_<NAME> for drivers.
Signed-off-by Bruce Richardson <[email protected]>
Quoted 9 lines
Applied with a note in the API release notes:
* config: Removed the old macros, included in ``rte_config.h``, to indicate which DPDK libraries and drivers are built.
The new macros are generated by meson in a standardized format:
``RTE_LIB_<NAME>`` and ``RTE_<CLASS>_<NAME>``, where ``NAME`` is the upper-case component name, e.g. ``EAL``, ``ETHDEV``, ``VIRTIO``, and ``CLASS`` is the upper-case driver class, e.g. ``NET``, ``CRYPTO``.
Thanks, Thomas.