From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 799CE1B5EE for ; Thu, 10 Jan 2019 12:12:04 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Jan 2019 03:12:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,461,1539673200"; d="scan'208";a="117031051" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.222.236]) by orsmga003.jf.intel.com with ESMTP; 10 Jan 2019 03:12:00 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: David Marchand , Thomas Monjalon , anatoly.burakov@intel.com, Bruce Richardson Date: Thu, 10 Jan 2019 11:11:04 +0000 Message-Id: <20190110111104.56464-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH] compat: merge compat library into EAL 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: , X-List-Received-Date: Thu, 10 Jan 2019 11:12:05 -0000 Since compat library is only a single header, we can easily move it into the EAL common headers instead of tracking it separately. The downside of this is that it becomes a little more difficult to have any libs that are built before EAL depend on it. Thankfully, this is not the case, so there are no big complications to the move. However, to ensure that we don't later hit problems later with this, we can add EAL common headers folder to the global include list in the meson build which means that all common headers can be safely used by all libraries, no matter what their build order. Signed-off-by: Bruce Richardson --- lib/Makefile | 2 -- lib/librte_cmdline/meson.build | 1 - lib/librte_compat/Makefile | 13 ------------- lib/librte_compat/meson.build | 8 -------- lib/librte_eal/common/Makefile | 2 +- .../common/include}/rte_compat.h | 0 lib/librte_eal/common/meson.build | 1 + lib/librte_eal/linuxapp/eal/meson.build | 2 +- lib/librte_eal/meson.build | 1 - lib/librte_kvargs/meson.build | 3 --- lib/meson.build | 2 +- meson.build | 2 +- 12 files changed, 5 insertions(+), 32 deletions(-) delete mode 100644 lib/librte_compat/Makefile delete mode 100644 lib/librte_compat/meson.build rename lib/{librte_compat => librte_eal/common/include}/rte_compat.h (100%) diff --git a/lib/Makefile b/lib/Makefile index 8dbdc9bca..91a8de4af 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -3,9 +3,7 @@ include $(RTE_SDK)/mk/rte.vars.mk -DIRS-y += librte_compat DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs -DEPDIRS-librte_kvargs := librte_compat DIRS-$(CONFIG_RTE_LIBRTE_EAL) += librte_eal DEPDIRS-librte_eal := librte_kvargs DIRS-$(CONFIG_RTE_LIBRTE_PCI) += librte_pci diff --git a/lib/librte_cmdline/meson.build b/lib/librte_cmdline/meson.build index 30498906c..0fa61385f 100644 --- a/lib/librte_cmdline/meson.build +++ b/lib/librte_cmdline/meson.build @@ -3,7 +3,6 @@ # This library is processed before EAL includes = [global_inc] -includes += include_directories('../librte_eal/common/include') version = 2 sources = files('cmdline.c', diff --git a/lib/librte_compat/Makefile b/lib/librte_compat/Makefile deleted file mode 100644 index 61089fe77..000000000 --- a/lib/librte_compat/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2013 Neil Horman -# All rights reserved. - -include $(RTE_SDK)/mk/rte.vars.mk - - -LIBABIVER := 1 - -# install includes -SYMLINK-y-include := rte_compat.h - -include $(RTE_SDK)/mk/rte.install.mk diff --git a/lib/librte_compat/meson.build b/lib/librte_compat/meson.build deleted file mode 100644 index 82c7eea55..000000000 --- a/lib/librte_compat/meson.build +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation - - -install_headers('rte_compat.h') - -set_variable('dep_rte_compat', - declare_dependency(include_directories: include_directories('.'))) diff --git a/lib/librte_eal/common/Makefile b/lib/librte_eal/common/Makefile index 87d8c455d..c487201b3 100644 --- a/lib/librte_eal/common/Makefile +++ b/lib/librte_eal/common/Makefile @@ -3,7 +3,7 @@ include $(RTE_SDK)/mk/rte.vars.mk -INC := rte_branch_prediction.h rte_common.h +INC := rte_branch_prediction.h rte_common.h rte_compat.h INC += rte_debug.h rte_eal.h rte_eal_interrupts.h INC += rte_errno.h rte_launch.h rte_lcore.h INC += rte_log.h rte_memory.h rte_memzone.h diff --git a/lib/librte_compat/rte_compat.h b/lib/librte_eal/common/include/rte_compat.h similarity index 100% rename from lib/librte_compat/rte_compat.h rename to lib/librte_eal/common/include/rte_compat.h diff --git a/lib/librte_eal/common/meson.build b/lib/librte_eal/common/meson.build index 2a10d57d8..5ecae0b1f 100644 --- a/lib/librte_eal/common/meson.build +++ b/lib/librte_eal/common/meson.build @@ -53,6 +53,7 @@ common_headers = files( 'include/rte_bitmap.h', 'include/rte_class.h', 'include/rte_common.h', + 'include/rte_compat.h', 'include/rte_debug.h', 'include/rte_devargs.h', 'include/rte_dev.h', diff --git a/lib/librte_eal/linuxapp/eal/meson.build b/lib/librte_eal/linuxapp/eal/meson.build index 6e31c2aaa..7e68b2c0d 100644 --- a/lib/librte_eal/linuxapp/eal/meson.build +++ b/lib/librte_eal/linuxapp/eal/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -eal_inc += include_directories('include', '../../../librte_compat') +eal_inc += include_directories('include') install_subdir('include/exec-env', install_dir: get_option('includedir')) env_objs = [] diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build index a18f3a826..64d857a4a 100644 --- a/lib/librte_eal/meson.build +++ b/lib/librte_eal/meson.build @@ -23,7 +23,6 @@ endif version = 9 # the version of the EAL API allow_experimental_apis = true -deps += 'compat' deps += 'kvargs' sources = common_sources + env_sources objs = common_objs + env_objs diff --git a/lib/librte_kvargs/meson.build b/lib/librte_kvargs/meson.build index acd3e5432..ecaedf5a5 100644 --- a/lib/librte_kvargs/meson.build +++ b/lib/librte_kvargs/meson.build @@ -2,10 +2,7 @@ # Copyright(c) 2017 Intel Corporation includes = [global_inc] -includes += include_directories('../librte_eal/common/include') version = 1 sources = files('rte_kvargs.c') headers = files('rte_kvargs.h') - -deps += 'compat' diff --git a/lib/meson.build b/lib/meson.build index 93d7901d4..46ba363ce 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -8,7 +8,7 @@ # sometimes skip deps that would be implied by others, e.g. if mempool is # given as a dep, no need to mention ring. This is especially true for the # core libs which are widely reused, so their deps are kept to a minimum. -libraries = [ 'compat', # just a header, used for versioning +libraries = [ 'cmdline', # ethdev depends on cmdline for parsing functions 'kvargs', # eal depends on kvargs 'eal', 'ring', 'mempool', 'mbuf', 'net', 'meter', 'ethdev', 'pci', # core diff --git a/meson.build b/meson.build index 7cee3c94a..29944f127 100644 --- a/meson.build +++ b/meson.build @@ -32,7 +32,7 @@ eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) # configure the build, and make sure configs here and in config folder are # able to be included in any file. We also store a global array of include dirs # for passing to pmdinfogen scripts -global_inc = include_directories('.', 'config') +global_inc = include_directories('.', 'config', 'lib/librte_eal/common/include') subdir('config') # build libs and drivers -- 2.20.1