meson: link static libs with whole-archive in subproject
Checks
Commit Message
When DPDK is used as a subproject, declare static libs to be linked with
-Wl,--whole-archive along with the drivers. This is already done this
way in pkg-config.
Fixes: f93a605f2d6e ("build: add definitions for use as Meson subproject")
Cc: stable@dpdk.org
Signed-off-by: Robin Jarry <rjarry@redhat.com>
---
buildtools/subproject/meson.build | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Comments
On Mon, Jan 29, 2024 at 1:47 PM Robin Jarry <rjarry@redhat.com> wrote:
>
> When DPDK is used as a subproject, declare static libs to be linked with
> -Wl,--whole-archive along with the drivers. This is already done this
> way in pkg-config.
>
> Fixes: f93a605f2d6e ("build: add definitions for use as Meson subproject")
> Cc: stable@dpdk.org
>
> Signed-off-by: Robin Jarry <rjarry@redhat.com>
Tested-by: David Marchand <david.marchand@redhat.com>
On Mon, Jan 29, 2024 at 01:55:36PM +0100, David Marchand wrote:
> On Mon, Jan 29, 2024 at 1:47 PM Robin Jarry <rjarry@redhat.com> wrote:
> >
> > When DPDK is used as a subproject, declare static libs to be linked with
> > -Wl,--whole-archive along with the drivers. This is already done this
> > way in pkg-config.
> >
> > Fixes: f93a605f2d6e ("build: add definitions for use as Meson subproject")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Robin Jarry <rjarry@redhat.com>
> Tested-by: David Marchand <david.marchand@redhat.com>
>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
29/01/2024 14:17, Bruce Richardson:
> On Mon, Jan 29, 2024 at 01:55:36PM +0100, David Marchand wrote:
> > On Mon, Jan 29, 2024 at 1:47 PM Robin Jarry <rjarry@redhat.com> wrote:
> > >
> > > When DPDK is used as a subproject, declare static libs to be linked with
> > > -Wl,--whole-archive along with the drivers. This is already done this
> > > way in pkg-config.
> > >
> > > Fixes: f93a605f2d6e ("build: add definitions for use as Meson subproject")
> > > Cc: stable@dpdk.org
> > >
> > > Signed-off-by: Robin Jarry <rjarry@redhat.com>
> > Tested-by: David Marchand <david.marchand@redhat.com>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Applied, thanks.
@@ -8,8 +8,7 @@ if get_option('default_library') == 'static'
dependencies: dpdk_static_lib_deps,
# static library deps in DPDK build don't include "link_with" parameters,
# so explicitly link-in both libs and drivers
- link_with: dpdk_static_libraries,
- link_whole: dpdk_drivers,
+ link_whole: dpdk_static_libraries + dpdk_drivers,
link_args: dpdk_extra_ldflags)
else
dpdk_dep = declare_dependency(