From 579182f2b06bd8e6f721fe4a525223702a1e3581 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 22 Jan 2018 15:42:54 +0000 Subject: [PATCH] build: set compat lib as universal dependency By making "compat" lib (which consists of a header only) a dependency of the EAL, we make the header file available to all other libs, drivers and apps, and thereby make it less work to do ABI versioning. Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- drivers/net/bonding/meson.build | 2 +- lib/librte_distributor/meson.build | 2 +- lib/librte_eal/meson.build | 1 + lib/librte_ether/meson.build | 2 +- lib/librte_hash/meson.build | 2 +- lib/librte_lpm/meson.build | 1 - 6 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/net/bonding/meson.build b/drivers/net/bonding/meson.build index 4dc5a5f671..b90abc6deb 100644 --- a/drivers/net/bonding/meson.build +++ b/drivers/net/bonding/meson.build @@ -6,6 +6,6 @@ sources = files('rte_eth_bond_api.c', 'rte_eth_bond_pmd.c', 'rte_eth_bond_args.c', 'rte_eth_bond_8023ad.c', 'rte_eth_bond_alb.c') deps += 'sched' # needed for rte_bitmap.h -deps += ['compat', 'ip_frag', 'cmdline'] +deps += ['ip_frag', 'cmdline'] install_headers('rte_eth_bond.h', 'rte_eth_bond_8023ad.h') diff --git a/lib/librte_distributor/meson.build b/lib/librte_distributor/meson.build index e9caf86755..dba7e3b2aa 100644 --- a/lib/librte_distributor/meson.build +++ b/lib/librte_distributor/meson.build @@ -8,4 +8,4 @@ else sources += files('rte_distributor_match_generic.c') endif headers = files('rte_distributor.h') -deps += ['mbuf', 'compat'] +deps += ['mbuf'] diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build index 38e4c6573b..6fb2ef17fe 100644 --- a/lib/librte_eal/meson.build +++ b/lib/librte_eal/meson.build @@ -46,6 +46,7 @@ endif version = 6 # the version of the EAL API allow_experimental_apis = true +deps += 'compat' cflags += '-D_GNU_SOURCE' sources = common_sources + env_sources objs = common_objs + env_objs diff --git a/lib/librte_ether/meson.build b/lib/librte_ether/meson.build index 97789b9fad..7fed860561 100644 --- a/lib/librte_ether/meson.build +++ b/lib/librte_ether/meson.build @@ -24,4 +24,4 @@ headers = files('rte_ethdev.h', 'rte_tm.h', 'rte_tm_driver.h') -deps += ['net', 'compat'] +deps += ['net'] diff --git a/lib/librte_hash/meson.build b/lib/librte_hash/meson.build index 8e11137895..e139e1d762 100644 --- a/lib/librte_hash/meson.build +++ b/lib/librte_hash/meson.build @@ -14,4 +14,4 @@ headers = files('rte_cmp_arm64.h', 'rte_thash.h') sources = files('rte_cuckoo_hash.c', 'rte_fbk_hash.c') -deps += ['ring', 'compat'] +deps += ['ring'] diff --git a/lib/librte_lpm/meson.build b/lib/librte_lpm/meson.build index a7c7fa7ae4..0678494272 100644 --- a/lib/librte_lpm/meson.build +++ b/lib/librte_lpm/meson.build @@ -7,4 +7,3 @@ headers = files('rte_lpm.h', 'rte_lpm6.h') # since header files have different names, we can install all vector headers # without worrying about which architecture we actually need headers += files('rte_lpm_altivec.h', 'rte_lpm_neon.h', 'rte_lpm_sse.h') -deps += ['compat'] -- 2.20.1