From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: david.marchand@redhat.com, bruce.richardson@intel.com,
ndabilpuram@marvell.com
Subject: [dpdk-dev] [PATCH] build: remove special handling for node library
Date: Wed, 1 Jul 2020 20:05:06 +0200 [thread overview]
Message-ID: <20200701180507.2850094-1-thomas@monjalon.net> (raw)
What is the point of adding librte_node a second time separately?
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
app/test/meson.build | 4 +---
examples/meson.build | 4 +---
lib/meson.build | 3 ---
meson.build | 1 -
4 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/app/test/meson.build b/app/test/meson.build
index b224d6f2bb..da5f39f018 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -415,15 +415,13 @@ endforeach
test_dep_objs += cc.find_library('execinfo', required: false)
link_libs = []
-link_nodes = []
if get_option('default_library') == 'static'
link_libs = dpdk_static_libraries + dpdk_drivers
- link_nodes = dpdk_graph_nodes
endif
dpdk_test = executable('dpdk-test',
test_sources,
- link_whole: link_libs + link_nodes,
+ link_whole: link_libs,
dependencies: test_dep_objs,
c_args: cflags,
install_rpath: driver_install_path,
diff --git a/examples/meson.build b/examples/meson.build
index 120eebf716..eb13e82101 100644
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -2,10 +2,8 @@
# Copyright(c) 2017-2019 Intel Corporation
link_whole_libs = []
-node_libs = []
if get_option('default_library') == 'static'
link_whole_libs = dpdk_static_libraries + dpdk_drivers
- node_libs = dpdk_graph_nodes
endif
execinfo = cc.find_library('execinfo', required: false)
@@ -101,7 +99,7 @@ foreach example: examples
endif
executable('dpdk-' + name, sources,
include_directories: includes,
- link_whole: link_whole_libs + node_libs,
+ link_whole: link_whole_libs,
link_args: dpdk_extra_ldflags,
c_args: cflags,
dependencies: dep_objs)
diff --git a/lib/meson.build b/lib/meson.build
index c1b9e1633f..8ca25172c3 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -202,9 +202,6 @@ foreach l:libraries
dpdk_libraries = [shared_lib] + dpdk_libraries
dpdk_static_libraries = [static_lib] + dpdk_static_libraries
- if libname == 'rte_node'
- dpdk_graph_nodes = [static_lib]
- endif
endif # sources.length() > 0
set_variable('shared_rte_' + name, shared_dep)
diff --git a/meson.build b/meson.build
index d21adfd303..e8bb9c4c1e 100644
--- a/meson.build
+++ b/meson.build
@@ -16,7 +16,6 @@ cc = meson.get_compiler('c')
dpdk_conf = configuration_data()
dpdk_libraries = []
dpdk_static_libraries = []
-dpdk_graph_nodes = []
dpdk_driver_classes = []
dpdk_drivers = []
dpdk_extra_ldflags = []
--
2.26.2
next reply other threads:[~2020-07-01 18:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-01 18:05 Thomas Monjalon [this message]
2020-07-02 9:17 ` Bruce Richardson
2020-07-02 9:53 ` Jerin Jacob
2020-07-02 10:21 ` Thomas Monjalon
2020-07-02 16:09 ` [dpdk-dev] [PATCH v2] " Thomas Monjalon
2020-07-04 14:22 ` Jerin Jacob
2020-07-05 10:50 ` Thomas Monjalon
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=20200701180507.2850094-1-thomas@monjalon.net \
--to=thomas@monjalon.net \
--cc=bruce.richardson@intel.com \
--cc=david.marchand@redhat.com \
--cc=dev@dpdk.org \
--cc=ndabilpuram@marvell.com \
/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).