build: change indentation in infrastructure files
Switch from using tabs to 4 spaces for meson.build indentation, for the basic infrastructure and tooling files, as well as doc and kernel directories. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
parent
cf59165dcb
commit
8dcb898c65
@ -37,8 +37,7 @@ implementer_generic = {
|
|||||||
['RTE_MAX_NUMA_NODES', 4]
|
['RTE_MAX_NUMA_NODES', 4]
|
||||||
],
|
],
|
||||||
'part_number_config': {
|
'part_number_config': {
|
||||||
'generic': {'machine_args': ['-march=armv8-a+crc',
|
'generic': {'machine_args': ['-march=armv8-a+crc', '-moutline-atomics']}
|
||||||
'-moutline-atomics']}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -51,8 +50,7 @@ part_number_config_arm = {
|
|||||||
'0xd0a': {'machine_args': ['-mcpu=cortex-a75']},
|
'0xd0a': {'machine_args': ['-mcpu=cortex-a75']},
|
||||||
'0xd0b': {'machine_args': ['-mcpu=cortex-a76']},
|
'0xd0b': {'machine_args': ['-mcpu=cortex-a76']},
|
||||||
'0xd0c': {
|
'0xd0c': {
|
||||||
'machine_args': ['-march=armv8.2-a+crypto',
|
'machine_args': ['-march=armv8.2-a+crypto', '-mcpu=neoverse-n1'],
|
||||||
'-mcpu=neoverse-n1'],
|
|
||||||
'flags': [
|
'flags': [
|
||||||
['RTE_MACHINE', '"neoverse-n1"'],
|
['RTE_MACHINE', '"neoverse-n1"'],
|
||||||
['RTE_ARM_FEATURE_ATOMICS', true],
|
['RTE_ARM_FEATURE_ATOMICS', true],
|
||||||
@ -108,8 +106,7 @@ implementer_cavium = {
|
|||||||
'flags': flags_part_number_thunderx
|
'flags': flags_part_number_thunderx
|
||||||
},
|
},
|
||||||
'0xaf': {
|
'0xaf': {
|
||||||
'machine_args': ['-march=armv8.1-a+crc+crypto',
|
'machine_args': ['-march=armv8.1-a+crc+crypto', '-mcpu=thunderx2t99'],
|
||||||
'-mcpu=thunderx2t99'],
|
|
||||||
'flags': [
|
'flags': [
|
||||||
['RTE_MACHINE', '"thunderx2"'],
|
['RTE_MACHINE', '"thunderx2"'],
|
||||||
['RTE_ARM_FEATURE_ATOMICS', true],
|
['RTE_ARM_FEATURE_ATOMICS', true],
|
||||||
@ -119,8 +116,7 @@ implementer_cavium = {
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
'0xb2': {
|
'0xb2': {
|
||||||
'machine_args': ['-march=armv8.2-a+crc+crypto+lse',
|
'machine_args': ['-march=armv8.2-a+crc+crypto+lse', '-mcpu=octeontx2'],
|
||||||
'-mcpu=octeontx2'],
|
|
||||||
'flags': [
|
'flags': [
|
||||||
['RTE_MACHINE', '"octeontx2"'],
|
['RTE_MACHINE', '"octeontx2"'],
|
||||||
['RTE_ARM_FEATURE_ATOMICS', true],
|
['RTE_ARM_FEATURE_ATOMICS', true],
|
||||||
@ -141,8 +137,7 @@ implementer_ampere = {
|
|||||||
['RTE_MAX_NUMA_NODES', 1]
|
['RTE_MAX_NUMA_NODES', 1]
|
||||||
],
|
],
|
||||||
'part_number_config': {
|
'part_number_config': {
|
||||||
'0x0': {'machine_args': ['-march=armv8-a+crc+crypto',
|
'0x0': {'machine_args': ['-march=armv8-a+crc+crypto', '-mtune=emag']}
|
||||||
'-mtune=emag']}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -154,8 +149,7 @@ implementer_hisilicon = {
|
|||||||
],
|
],
|
||||||
'part_number_config': {
|
'part_number_config': {
|
||||||
'0xd01': {
|
'0xd01': {
|
||||||
'machine_args': ['-march=armv8.2-a+crypto',
|
'machine_args': ['-march=armv8.2-a+crypto', '-mtune=tsv110'],
|
||||||
'-mtune=tsv110'],
|
|
||||||
'flags': [
|
'flags': [
|
||||||
['RTE_MACHINE', '"Kunpeng 920"'],
|
['RTE_MACHINE', '"Kunpeng 920"'],
|
||||||
['RTE_ARM_FEATURE_ATOMICS', true],
|
['RTE_ARM_FEATURE_ATOMICS', true],
|
||||||
@ -362,8 +356,7 @@ else
|
|||||||
if machine == 'generic'
|
if machine == 'generic'
|
||||||
# generic build
|
# generic build
|
||||||
if soc != ''
|
if soc != ''
|
||||||
error('Building for a particular platform is ' +
|
error('Building for a particular platform is unsupported with generic build.')
|
||||||
'unsupported with generic build.')
|
|
||||||
endif
|
endif
|
||||||
implementer_id = 'generic'
|
implementer_id = 'generic'
|
||||||
part_number = 'generic'
|
part_number = 'generic'
|
||||||
@ -373,8 +366,8 @@ else
|
|||||||
# native build
|
# native build
|
||||||
# The script returns ['Implementer', 'Variant', 'Architecture',
|
# The script returns ['Implementer', 'Variant', 'Architecture',
|
||||||
# 'Primary Part number', 'Revision']
|
# 'Primary Part number', 'Revision']
|
||||||
detect_vendor = find_program(join_paths(
|
detect_vendor = find_program(join_paths(meson.current_source_dir(),
|
||||||
meson.current_source_dir(), 'armv8_machine.py'))
|
'armv8_machine.py'))
|
||||||
cmd = run_command(detect_vendor.path())
|
cmd = run_command(detect_vendor.path())
|
||||||
if cmd.returncode() == 0
|
if cmd.returncode() == 0
|
||||||
cmd_output = cmd.stdout().to_lower().strip().split(' ')
|
cmd_output = cmd.stdout().to_lower().strip().split(' ')
|
||||||
|
@ -22,8 +22,7 @@ is_ms_linker = is_windows and (cc.get_id() == 'clang')
|
|||||||
# depending on the configuration options
|
# depending on the configuration options
|
||||||
pver = meson.project_version().split('.')
|
pver = meson.project_version().split('.')
|
||||||
major_version = '@0@.@1@'.format(pver.get(0), pver.get(1))
|
major_version = '@0@.@1@'.format(pver.get(0), pver.get(1))
|
||||||
abi_version = run_command(find_program('cat', 'more'),
|
abi_version = run_command(find_program('cat', 'more'), abi_version_file).stdout().strip()
|
||||||
abi_version_file).stdout().strip()
|
|
||||||
|
|
||||||
# Libraries have the abi_version as the filename extension
|
# Libraries have the abi_version as the filename extension
|
||||||
# and have the soname be all but the final part of the abi_version.
|
# and have the soname be all but the final part of the abi_version.
|
||||||
@ -59,8 +58,7 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path)
|
|||||||
# to be in the library path, so symlink the drivers from the main lib directory.
|
# to be in the library path, so symlink the drivers from the main lib directory.
|
||||||
if not is_windows
|
if not is_windows
|
||||||
meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
|
meson.add_install_script('../buildtools/symlink-drivers-solibs.sh',
|
||||||
get_option('libdir'),
|
get_option('libdir'), pmd_subdir_opt)
|
||||||
pmd_subdir_opt)
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# init disable/enable driver lists that will be populated in different places
|
# init disable/enable driver lists that will be populated in different places
|
||||||
@ -225,7 +223,7 @@ warning_flags = [
|
|||||||
# globally disabled warnings
|
# globally disabled warnings
|
||||||
'-Wno-address-of-packed-member',
|
'-Wno-address-of-packed-member',
|
||||||
'-Wno-packed-not-aligned',
|
'-Wno-packed-not-aligned',
|
||||||
'-Wno-missing-field-initializers'
|
'-Wno-missing-field-initializers',
|
||||||
]
|
]
|
||||||
if cc.get_id() == 'gcc' and cc.version().version_compare('>=10.0')
|
if cc.get_id() == 'gcc' and cc.version().version_compare('>=10.0')
|
||||||
# FIXME: Bugzilla 396
|
# FIXME: Bugzilla 396
|
||||||
|
@ -24,8 +24,7 @@ html_guides = custom_target('html_guides',
|
|||||||
install: get_option('enable_docs'),
|
install: get_option('enable_docs'),
|
||||||
install_dir: htmldir)
|
install_dir: htmldir)
|
||||||
|
|
||||||
install_data(files('custom.css'),
|
install_data(files('custom.css'), install_dir: join_paths(htmldir,'_static', 'css'))
|
||||||
install_dir: join_paths(htmldir,'_static', 'css'))
|
|
||||||
|
|
||||||
doc_targets += html_guides
|
doc_targets += html_guides
|
||||||
doc_target_names += 'HTML_Guides'
|
doc_target_names += 'HTML_Guides'
|
||||||
|
@ -8,7 +8,8 @@ kni_mkfile = custom_target('rte_kni_makefile',
|
|||||||
kni_sources = files(
|
kni_sources = files(
|
||||||
'kni_misc.c',
|
'kni_misc.c',
|
||||||
'kni_net.c',
|
'kni_net.c',
|
||||||
'Kbuild')
|
'Kbuild',
|
||||||
|
)
|
||||||
|
|
||||||
custom_target('rte_kni',
|
custom_target('rte_kni',
|
||||||
input: kni_sources,
|
input: kni_sources,
|
||||||
|
@ -64,8 +64,7 @@ elif cross_compiler.endswith('clang')
|
|||||||
endif
|
endif
|
||||||
endforeach
|
endforeach
|
||||||
if cross_prefix == ''
|
if cross_prefix == ''
|
||||||
error('Didn\'t find -target and its value in' +
|
error('Did not find -target and its value in c_args in input cross-file.')
|
||||||
' c_args in input cross-file.')
|
|
||||||
endif
|
endif
|
||||||
linker = 'lld'
|
linker = 'lld'
|
||||||
foreach cross_c_link_arg : meson.get_cross_property('c_link_args')
|
foreach cross_c_link_arg : meson.get_cross_property('c_link_args')
|
||||||
|
@ -1,44 +1,44 @@
|
|||||||
# Please keep these options sorted alphabetically.
|
# Please keep these options sorted alphabetically.
|
||||||
|
|
||||||
option('check_includes', type: 'boolean', value: false,
|
option('check_includes', type: 'boolean', value: false, description:
|
||||||
description: 'build "chkincs" to verify each header file can compile alone')
|
'build "chkincs" to verify each header file can compile alone')
|
||||||
option('developer_mode', type: 'feature',
|
option('developer_mode', type: 'feature', description:
|
||||||
description: 'turn on additional build checks relevant for DPDK developers')
|
'turn on additional build checks relevant for DPDK developers')
|
||||||
option('disable_drivers', type: 'string', value: '',
|
option('disable_drivers', type: 'string', value: '', description:
|
||||||
description: 'Comma-separated list of drivers to explicitly disable.')
|
'Comma-separated list of drivers to explicitly disable.')
|
||||||
option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>',
|
option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>', description:
|
||||||
description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
|
'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
|
||||||
option('enable_docs', type: 'boolean', value: false,
|
option('enable_docs', type: 'boolean', value: false, description:
|
||||||
description: 'build documentation')
|
'build documentation')
|
||||||
option('enable_drivers', type: 'string', value: '',
|
option('enable_drivers', type: 'string', value: '', description:
|
||||||
description: 'Comma-separated list of drivers to build. If unspecified, build all drivers.')
|
'Comma-separated list of drivers to build. If unspecified, build all drivers.')
|
||||||
option('enable_driver_sdk', type: 'boolean', value: false,
|
option('enable_driver_sdk', type: 'boolean', value: false, description:
|
||||||
description: 'Install headers to build drivers.')
|
'Install headers to build drivers.')
|
||||||
option('enable_kmods', type: 'boolean', value: false,
|
option('enable_kmods', type: 'boolean', value: false, description:
|
||||||
description: 'build kernel modules')
|
'build kernel modules')
|
||||||
option('examples', type: 'string', value: '',
|
option('examples', type: 'string', value: '', description:
|
||||||
description: 'Comma-separated list of examples to build by default')
|
'Comma-separated list of examples to build by default')
|
||||||
option('flexran_sdk', type: 'string', value: '',
|
option('flexran_sdk', type: 'string', value: '', description:
|
||||||
description: 'Path to FlexRAN SDK optional Libraries for BBDEV device')
|
'Path to FlexRAN SDK optional Libraries for BBDEV device')
|
||||||
option('ibverbs_link', type: 'combo', choices : ['static', 'shared', 'dlopen'], value: 'shared',
|
option('ibverbs_link', type: 'combo', choices : ['static', 'shared', 'dlopen'], value: 'shared', description:
|
||||||
description: 'Linkage method (static/shared/dlopen) for Mellanox PMDs with ibverbs dependencies.')
|
'Linkage method (static/shared/dlopen) for Mellanox PMDs with ibverbs dependencies.')
|
||||||
option('include_subdir_arch', type: 'string', value: '',
|
option('include_subdir_arch', type: 'string', value: '', description:
|
||||||
description: 'subdirectory where to install arch-dependent headers')
|
'subdirectory where to install arch-dependent headers')
|
||||||
option('kernel_dir', type: 'string', value: '',
|
option('kernel_dir', type: 'string', value: '', description:
|
||||||
description: 'Path to the kernel for building kernel modules. Headers must be in $kernel_dir or $kernel_dir/build. Modules will be installed in /lib/modules.')
|
'Path to the kernel for building kernel modules. Headers must be in $kernel_dir or $kernel_dir/build. Modules will be installed in /lib/modules.')
|
||||||
option('machine', type: 'string', value: 'native',
|
option('machine', type: 'string', value: 'native', description:
|
||||||
description: 'set the target machine type or "generic", a build usable on all machines of the build machine architecture or "native", which lets the compiler pick the architecture of the build machine.')
|
'set the target machine type or "generic", a build usable on all machines of the build machine architecture or "native", which lets the compiler pick the architecture of the build machine.')
|
||||||
option('max_ethports', type: 'integer', value: 32,
|
option('max_ethports', type: 'integer', value: 32, description:
|
||||||
description: 'maximum number of Ethernet devices')
|
'maximum number of Ethernet devices')
|
||||||
option('max_lcores', type: 'integer', value: 128,
|
option('max_lcores', type: 'integer', value: 128, description:
|
||||||
description: 'maximum number of cores/threads supported by EAL')
|
'maximum number of cores/threads supported by EAL')
|
||||||
option('max_numa_nodes', type: 'integer', value: 32,
|
option('max_numa_nodes', type: 'integer', value: 32, description:
|
||||||
description: 'maximum number of NUMA nodes supported by EAL')
|
'maximum number of NUMA nodes supported by EAL')
|
||||||
option('platform', type: 'string', value: '',
|
option('platform', type: 'string', value: '', description:
|
||||||
description: 'use configuration for a particular platform (such as a SoC).')
|
'use configuration for a particular platform (such as a SoC).')
|
||||||
option('enable_trace_fp', type: 'boolean', value: false,
|
option('enable_trace_fp', type: 'boolean', value: false, description:
|
||||||
description: 'enable fast path trace points.')
|
'enable fast path trace points.')
|
||||||
option('tests', type: 'boolean', value: true,
|
option('tests', type: 'boolean', value: true, description:
|
||||||
description: 'build unit tests')
|
'build unit tests')
|
||||||
option('use_hpet', type: 'boolean', value: false,
|
option('use_hpet', type: 'boolean', value: false, description:
|
||||||
description: 'use HPET timer in EAL')
|
'use HPET timer in EAL')
|
||||||
|
@ -5,5 +5,6 @@ install_data([
|
|||||||
'dpdk-devbind.py',
|
'dpdk-devbind.py',
|
||||||
'dpdk-pmdinfo.py',
|
'dpdk-pmdinfo.py',
|
||||||
'dpdk-telemetry.py',
|
'dpdk-telemetry.py',
|
||||||
'dpdk-hugepages.py'
|
'dpdk-hugepages.py',
|
||||||
],install_dir: 'bin')
|
],
|
||||||
|
install_dir: 'bin')
|
||||||
|
Loading…
Reference in New Issue
Block a user