d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: remove checks for non-optional libraries

Browse Source 
Unless a library cannot be built for a specific platform (generally
BSD), it will always be available. Therefore remove checks for IP
fragmentation and ACL libraries, since these are built for all
platforms.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
Bruce Richardson 2018-03-29 14:48:47 +01:00
parent 3f708560fe
commit 629dbf2aa3
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/librte_port/meson.build
View File

@ -5,23 +5,21 @@ version = 3
sources = files( sources = files(
'rte_port_ethdev.c', 'rte_port_ethdev.c',
'rte_port_fd.c', 'rte_port_fd.c',
'rte_port_frag.c',
'rte_port_ras.c',
'rte_port_ring.c', 'rte_port_ring.c',
'rte_port_sched.c', 'rte_port_sched.c',
'rte_port_source_sink.c') 'rte_port_source_sink.c')
headers = files( headers = files(
'rte_port_ethdev.h', 'rte_port_ethdev.h',
'rte_port_fd.h', 'rte_port_fd.h',
'rte_port_frag.h',
'rte_port_ras.h',
'rte_port.h', 'rte_port.h',
'rte_port_ring.h', 'rte_port_ring.h',
'rte_port_sched.h', 'rte_port_sched.h',
'rte_port_source_sink.h') 'rte_port_source_sink.h')
deps += ['ethdev', 'sched'] deps += ['ethdev', 'sched', 'ip_frag']
if dpdk_conf.has('RTE_LIBRTE_IP_FRAG')
sources += files('rte_port_frag.c', 'rte_port_ras.c')
headers += files('rte_port_frag.h', 'rte_port_ras.h')
deps += ['ip_frag']
endif
if dpdk_conf.has('RTE_LIBRTE_KNI') if dpdk_conf.has('RTE_LIBRTE_KNI')
sources += files('rte_port_kni.c') sources += files('rte_port_kni.c')

34
lib/librte_table/meson.build
View File

@ -2,23 +2,27 @@
# Copyright(c) 2017 Intel Corporation # Copyright(c) 2017 Intel Corporation
version = 3 version = 3
sources = files('rte_table_lpm.c', 'rte_table_lpm_ipv6.c', sources = files('rte_table_acl.c',
'rte_table_hash_cuckoo.c', 'rte_table_hash_key8.c', 'rte_table_lpm.c',
'rte_table_hash_key16.c', 'rte_table_hash_key32.c', 'rte_table_lpm_ipv6.c',
'rte_table_hash_ext.c', 'rte_table_hash_lru.c', 'rte_table_hash_cuckoo.c',
'rte_table_array.c', 'rte_table_stub.c') 'rte_table_hash_key8.c',
headers = files('rte_table.h', 'rte_table_lpm.h', 'rte_table_hash_key16.c',
'rte_table_lpm_ipv6.h', 'rte_table_hash.h', 'rte_table_hash_key32.c',
'rte_lru.h', 'rte_table_array.h', 'rte_table_hash_ext.c',
'rte_table_hash_lru.c',
'rte_table_array.c',
'rte_table_stub.c')
headers = files('rte_table.h',
'rte_table_acl.h',
'rte_table_lpm.h',
'rte_table_lpm_ipv6.h',
'rte_table_hash.h',
'rte_lru.h',
'rte_table_array.h',
'rte_table_stub.h') 'rte_table_stub.h')
deps += ['mbuf', 'port', 'lpm', 'hash'] deps += ['mbuf', 'port', 'lpm', 'hash', 'acl']
if arch_subdir == 'x86' if arch_subdir == 'x86'
headers += files('rte_lru_x86.h') headers += files('rte_lru_x86.h')
endif endif
if dpdk_conf.has('RTE_LIBRTE_ACL')
sources += files('rte_table_acl.c')
headers += files('rte_table_acl.h')
deps += ['acl']
endif