From 629dbf2aa37a070dede337acf273e11a25e96001 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@intel.com>
Date: Thu, 29 Mar 2018 14:48:47 +0100
Subject: [PATCH] build: remove checks for non-optional libraries

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>
---
 lib/librte_port/meson.build  | 12 +++++-------
 lib/librte_table/meson.build | 34 +++++++++++++++++++---------------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/lib/librte_port/meson.build b/lib/librte_port/meson.build
index debb5eb906..f3d8b4434c 100644
--- a/lib/librte_port/meson.build
+++ b/lib/librte_port/meson.build
@@ -5,23 +5,21 @@ version = 3
 sources = files(
 	'rte_port_ethdev.c',
 	'rte_port_fd.c',
+	'rte_port_frag.c',
+	'rte_port_ras.c',
 	'rte_port_ring.c',
 	'rte_port_sched.c',
 	'rte_port_source_sink.c')
 headers = files(
 	'rte_port_ethdev.h',
 	'rte_port_fd.h',
+	'rte_port_frag.h',
+	'rte_port_ras.h',
 	'rte_port.h',
 	'rte_port_ring.h',
 	'rte_port_sched.h',
 	'rte_port_source_sink.h')
-deps += ['ethdev', 'sched']
-
-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
+deps += ['ethdev', 'sched', 'ip_frag']
 
 if dpdk_conf.has('RTE_LIBRTE_KNI')
 	sources += files('rte_port_kni.c')
diff --git a/lib/librte_table/meson.build b/lib/librte_table/meson.build
index 0944bef81a..39ffaf11a0 100644
--- a/lib/librte_table/meson.build
+++ b/lib/librte_table/meson.build
@@ -2,23 +2,27 @@
 # Copyright(c) 2017 Intel Corporation
 
 version = 3
-sources = files('rte_table_lpm.c', 'rte_table_lpm_ipv6.c',
-		'rte_table_hash_cuckoo.c', 'rte_table_hash_key8.c',
-		'rte_table_hash_key16.c', 'rte_table_hash_key32.c',
-		'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_lpm.h',
-		'rte_table_lpm_ipv6.h', 'rte_table_hash.h',
-		'rte_lru.h', 'rte_table_array.h',
+sources = files('rte_table_acl.c',
+		'rte_table_lpm.c',
+		'rte_table_lpm_ipv6.c',
+		'rte_table_hash_cuckoo.c',
+		'rte_table_hash_key8.c',
+		'rte_table_hash_key16.c',
+		'rte_table_hash_key32.c',
+		'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')
-deps += ['mbuf', 'port', 'lpm', 'hash']
+deps += ['mbuf', 'port', 'lpm', 'hash', 'acl']
 
 if arch_subdir == 'x86'
 	headers += files('rte_lru_x86.h')
 endif
-
-if dpdk_conf.has('RTE_LIBRTE_ACL')
-	sources += files('rte_table_acl.c')
-	headers += files('rte_table_acl.h')
-	deps += ['acl']
-endif
-- 
2.20.1