From patchwork Thu Mar 29 13:48:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 36657 X-Patchwork-Delegate: bruce.richardson@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0DE362BCD; Thu, 29 Mar 2018 15:48:56 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 3E4CF2BBD for ; Thu, 29 Mar 2018 15:48:55 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Mar 2018 06:48:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,376,1517904000"; d="scan'208";a="28581584" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by fmsmga008.fm.intel.com with ESMTP; 29 Mar 2018 06:48:52 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: cristian.dumitrescu@intel.com, Bruce Richardson Date: Thu, 29 Mar 2018 14:48:47 +0100 Message-Id: <20180329134847.92805-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.14.3 Subject: [dpdk-dev] [PATCH] build: remove checks for non-optional libraries X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 --- 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 debb5eb90..f3d8b4434 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 0944bef81..39ffaf11a 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