From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: bluca@debian.org, thomas@monjalon.net, mb@smartsharesystems.com,
techboard@dpdk.org, Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [PATCH 1/3] build: align variable names between drivers and libs
Date: Wed, 25 Sep 2019 15:55:29 +0100 [thread overview]
Message-ID: <20190925145531.52705-2-bruce.richardson@intel.com> (raw)
In-Reply-To: <20190925145531.52705-1-bruce.richardson@intel.com>
The variable names in the library and drivers meson.build files are slighty
different with "static_deps" in one and "static_objs" in the other. Rename
to use "static_deps" in both for consistency.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/meson.build | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/meson.build b/drivers/meson.build
index 2ed2e9541..b54601697 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -79,18 +79,18 @@ foreach class:dpdk_driver_classes
endif
# get dependency objs from strings
- shared_objs = []
- static_objs = []
+ shared_deps = []
+ static_deps = []
foreach d:deps
if not is_variable('shared_rte_' + d)
error('Missing dependency ' + d +
' for driver ' + lib_name)
endif
- shared_objs += [get_variable('shared_rte_' + d)]
- static_objs += [get_variable('static_rte_' + d)]
+ shared_deps += [get_variable('shared_rte_' + d)]
+ static_deps += [get_variable('static_rte_' + d)]
endforeach
- shared_objs += ext_deps
- static_objs += ext_deps
+ shared_deps += ext_deps
+ static_deps += ext_deps
dpdk_extra_ldflags += pkgconfig_extra_libs
# generate pmdinfo sources by building a temporary
@@ -101,7 +101,7 @@ foreach class:dpdk_driver_classes
tmp_lib = static_library('tmp_' + lib_name,
sources,
include_directories: includes,
- dependencies: static_objs,
+ dependencies: static_deps,
c_args: cflags)
objs += tmp_lib.extract_all_objects()
sources = custom_target(out_filename,
@@ -123,7 +123,7 @@ foreach class:dpdk_driver_classes
sources,
objects: objs,
include_directories: includes,
- dependencies: static_objs,
+ dependencies: static_deps,
c_args: cflags,
install: true)
@@ -135,7 +135,7 @@ foreach class:dpdk_driver_classes
sources,
objects: objs,
include_directories: includes,
- dependencies: shared_objs,
+ dependencies: shared_deps,
c_args: cflags,
link_args: '-Wl,--version-script=' + version_map,
link_depends: version_map,
@@ -148,10 +148,10 @@ foreach class:dpdk_driver_classes
# testpmd or other built-in apps can find it if necessary
shared_dep = declare_dependency(link_with: shared_lib,
include_directories: includes,
- dependencies: shared_objs)
+ dependencies: shared_deps)
static_dep = declare_dependency(link_with: static_lib,
include_directories: includes,
- dependencies: static_objs)
+ dependencies: static_deps)
dpdk_drivers += static_lib
--
2.21.0
next prev parent reply other threads:[~2019-09-25 14:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-25 14:55 [dpdk-dev] [PATCH 0/3] RFC: Support disabling DPDK drivers in meson builds Bruce Richardson
2019-09-25 14:55 ` Bruce Richardson [this message]
2019-09-25 14:55 ` [dpdk-dev] [PATCH 2/3] build: process dependencies before main build check Bruce Richardson
2019-09-25 14:55 ` [dpdk-dev] [PATCH 3/3] build: support disabling drivers with meson Bruce Richardson
2022-01-06 8:23 ` Morten Brørup
2022-01-06 9:48 ` Thomas Monjalon
2022-01-06 10:10 ` Morten Brørup
2022-01-07 13:42 ` Bruce Richardson
2019-09-25 18:01 ` [dpdk-dev] [PATCH 0/3] RFC: Support disabling DPDK drivers in meson builds Luca Boccassi
2019-09-26 8:33 ` Bruce Richardson
2019-09-26 15:28 ` Morten Brørup
2019-10-23 21:24 ` Thomas Monjalon
2019-09-27 7:14 ` [dpdk-dev] [dpdk-techboard] " Maxime Coquelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190925145531.52705-2-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=bluca@debian.org \
--cc=dev@dpdk.org \
--cc=mb@smartsharesystems.com \
--cc=techboard@dpdk.org \
--cc=thomas@monjalon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).