From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 5EF03A034F for ; Mon, 22 Mar 2021 12:21:53 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 57AEA4003D; Mon, 22 Mar 2021 12:21:53 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 8B89C4003D for ; Mon, 22 Mar 2021 12:21:51 +0100 (CET) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lOId5-0001ak-Aj; Mon, 22 Mar 2021 11:21:51 +0000 From: Christian Ehrhardt To: stable@dpdk.org, Thomas Monjalon , Luca Boccassi , Bruce Richardson Cc: Pai Sunil , Ilya Maximets , Stokes Ian , Govindharajan Hariprasad , James Page , Christian Ehrhardt Date: Mon, 22 Mar 2021 12:21:33 +0100 Message-Id: <20210322112135.3420072-6-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210322112135.3420072-1-christian.ehrhardt@canonical.com> References: <20210322112135.3420072-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 5/7] Revert "Revert "Revert "build: always link whole DPDK static libraries""" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" This reverts commit a3bd9a34bf9988de641b6e78b825fafb69d2d13f. This series changes linking behavior in 19.11.x and thereby should stay out. It breaks - for example - a rebuild of OVS 2.13 or builds of later OVS 2.13.x stable releases. --- app/test/meson.build | 2 +- drivers/meson.build | 2 +- examples/meson.build | 6 +++--- lib/meson.build | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 24fb59f74f..860728bb07 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -391,7 +391,7 @@ test_dep_objs += cc.find_library('execinfo', required: false) link_libs = [] if get_option('default_library') == 'static' - link_libs = dpdk_static_libraries + dpdk_drivers + link_libs = dpdk_drivers endif dpdk_test = executable('dpdk-test', diff --git a/drivers/meson.build b/drivers/meson.build index 696079680b..0400d84675 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -198,7 +198,7 @@ foreach class:dpdk_driver_classes shared_dep = declare_dependency(link_with: shared_lib, include_directories: includes, dependencies: shared_deps) - static_dep = declare_dependency( + static_dep = declare_dependency(link_with: static_lib, include_directories: includes, dependencies: static_deps) diff --git a/examples/meson.build b/examples/meson.build index 9e081f3fb7..4dc292fbd1 100644 --- a/examples/meson.build +++ b/examples/meson.build @@ -1,9 +1,9 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017-2019 Intel Corporation -link_whole_libs = [] +driver_libs = [] if get_option('default_library') == 'static' - link_whole_libs = dpdk_static_libraries + dpdk_drivers + driver_libs = dpdk_drivers endif execinfo = cc.find_library('execinfo', required: false) @@ -97,7 +97,7 @@ foreach example: examples endif executable('dpdk-' + name, sources, include_directories: includes, - link_whole: link_whole_libs, + link_whole: driver_libs, link_args: ldflags, c_args: cflags, dependencies: dep_objs) diff --git a/lib/meson.build b/lib/meson.build index b60396428c..f8da4f3168 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -127,7 +127,7 @@ foreach l:libraries dependencies: static_deps, include_directories: includes, install: true) - static_dep = declare_dependency( + static_dep = declare_dependency(link_with: static_lib, include_directories: includes, dependencies: static_deps) -- 2.30.0