From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 677C0A0522;
Thu, 2 Jul 2020 18:09:24 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 89BF81D931;
Thu, 2 Jul 2020 18:09:23 +0200 (CEST)
Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com
[66.111.4.28]) by dpdk.org (Postfix) with ESMTP id 0F9C31D930
for <dev@dpdk.org>; Thu, 2 Jul 2020 18:09:22 +0200 (CEST)
Received: from compute7.internal (compute7.nyi.internal [10.202.2.47])
by mailout.nyi.internal (Postfix) with ESMTP id 581235C01F5;
Thu, 2 Jul 2020 12:09:21 -0400 (EDT)
Received: from mailfrontend1 ([10.202.2.162])
by compute7.internal (MEProxy); Thu, 02 Jul 2020 12:09:21 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h=
from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding; s=fm1; bh=RejqkKEAPK10L
yKQrsmRLzjpfmOwYLFIYapuEwTbzrE=; b=e+/UQik0Tqrr2vVu0XX2P30ifc36J
zuwC+5kQFZzEjfe+M1tnit8njBX5YAZANyVUl7cFoADLScVbeoV3628VQFMvdShl
1KbxPBnOuIXQ1UFpZWYRqyzqNjyQwUy5NFkKTmNH43s3hBtuyRMQSU0fo0npXMsW
/yxcX7QPVxnPBP1xF9y3Jq2KVEpQXH/PyVBHUMBIJ+OMOTj7co+38tqpjjARO46y
h1lp8FuFHQ9NPqDHTenVbrvr+chd7bTQdieYPO4XV8wMuWvQj/noDpU0g3one/tS
nWYSFSwzXq+IZRBneHUpWfW++/N7v4utbeA/h0GVboaznC2oPPsYFT3hg==
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=
messagingengine.com; h=cc:content-transfer-encoding:date:from
:in-reply-to:message-id:mime-version:references:subject:to
:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=
fm3; bh=RejqkKEAPK10LyKQrsmRLzjpfmOwYLFIYapuEwTbzrE=; b=iFW6lGk/
oY001QW+3CaYsMGYuLLCREj4SoXTNcUqYa7jfRtIZgan2RskXx3G9vQC7ocJkihh
HXrMOoB0VNiCkusodIAdJBUe72Po7LXHnSE9g+mfsOct8Q/LofIIVI0sQCeIHvMQ
VSGDbz2LQIIk6g9OKej26h4aGvkr8Z78NBRDpUf1wtCRcGrJbQO6b0SF6ZT12zGD
hhIMVxeMPqAtuonknnYYtjTNKaPjY5nrGECyS/aTzU2kZy96WAMJ3nLVR3FXc6RQ
nYe08Ju2DWwnfIlBM0s9BTtTRDpklXH+Gnzcnkc3W29rkyUth2QAb/PFMoPEiufh
oY5yuIBI3bKqyQ==
X-ME-Sender: <xms:sAb-Xu82Jr2kJzzqwqn-eAxg48fx8MLD8DwHFMRj0j1bRIe7swt9wA>
X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrtdeggdeludcutefuodetggdotefrodftvf
curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu
uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc
fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs
ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucggtf
frrghtthgvrhhnpedvhefgiedvjeegtdevheefhfetleefgfeivefgffevfeejgedtgfeu
tdehtdegveenucfkphepjeejrddufeegrddvtdefrddukeegnecuvehluhhsthgvrhfuih
iivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgrlhho
nhdrnhgvth
X-ME-Proxy: <xmx:sAb-Xus56gw7MBMnfYoLDnq9AI1zLLR6N-yM_oEapjJkuG2hLAM4PA>
<xmx:sAb-XkAjyBW3k0zGT1AzWZh0basMW5ZjKi_ru9f0QVQ5vrTXQZjBVw>
<xmx:sAb-XmfuxVknHJ0yAwv4TbZFZ776Rf8Wt50bE4L_v9tT5F_98FYo-g>
<xmx:sQb-XsqRsNG8MxvYmBUuU-3bWwDmRRzNm2hdCNZi7t0On0CqTroh9Q>
Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184])
by mail.messagingengine.com (Postfix) with ESMTPA id C1E953280059;
Thu, 2 Jul 2020 12:09:19 -0400 (EDT)
From: Thomas Monjalon <thomas@monjalon.net>
To: dev@dpdk.org
Cc: david.marchand@redhat.com, bruce.richardson@intel.com,
ndabilpuram@marvell.com, jerinj@marvell.com,
Luca Boccassi <bluca@debian.org>, Sunil Pai G <sunil.pai.g@intel.com>
Date: Thu, 2 Jul 2020 18:09:11 +0200
Message-Id: <20200702160911.3596412-1-thomas@monjalon.net>
X-Mailer: git-send-email 2.26.2
In-Reply-To: <20200701180507.2850094-1-thomas@monjalon.net>
References: <20200701180507.2850094-1-thomas@monjalon.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v2] build: remove special handling for node
library
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
The node library had a need of being linked as a whole
to make some constructors effective.
Now that all libraries are linked with --whole-archive,
there is no need to have this library separate.
Fixes: e2db26f76673 ("build: always link whole DPDK static libraries")
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
v2: write real commit log
---
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