On Thu, Apr 04, 2024 at 11:47:49AM -0700, Tyler Retzlaff wrote:
> On Fri, Mar 15, 2024 at 08:28:55AM +0000, Bruce Richardson wrote:
> > On Thu, Mar 14, 2024 at 11:30:22PM -0700, Tyler Retzlaff wrote:
> > > Use static deps when default_library=static and use shared deps when
> > > using default_library=shared.
> > >
> > > Signed-off-by: Tyler Retzlaff <roret...@linux.microsoft.com>
> > > ---
> > > buildtools/chkincs/meson.build | 18 +++++++++++++-----
> > > 1 file changed, 13 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/buildtools/chkincs/meson.build
> > > b/buildtools/chkincs/meson.build
> > > index f2dadca..66245a5 100644
> > > --- a/buildtools/chkincs/meson.build
> > > +++ b/buildtools/chkincs/meson.build
> > > @@ -20,11 +20,19 @@ sources += gen_c_files.process(dpdk_chkinc_headers)
> > >
> > > # some driver SDK headers depend on these two buses, which are mandatory
> > > in build
> > > # so we always include them in deps list
> > > -deps = [get_variable('shared_rte_bus_vdev'),
> > > get_variable('shared_rte_bus_pci')]
> > > -# add the rest of the libs to the dependencies
> > > -foreach l:dpdk_libs_enabled
> > > - deps += get_variable('shared_rte_' + l)
> > > -endforeach
> > > +if is_shared_enabled
> > > + deps = [get_variable('shared_rte_bus_vdev'),
> > > get_variable('shared_rte_bus_pci')]
> > > + # add the rest of the libs to the dependencies
> > > + foreach l:dpdk_libs_enabled
> > > + deps += get_variable('shared_rte_' + l)
> > > + endforeach
> > > +else
> > > + deps = [get_variable('static_rte_bus_vdev'),
> > > get_variable('static_rte_bus_pci')]
> > > + # add the rest of the libs to the dependencies
> > > + foreach l:dpdk_libs_enabled
> > > + deps += get_variable('static_rte_' + l)
> > > + endforeach
> > > +endif
> > >
> >
> > Should the deps checks in lib and driver not be similarly conditional?
>
> i might need more context about what you think is wrong. i think the
> problem here was that there are not separate variables for shared_deps
> vs static_deps.
>
> for my changes to lib/meson.build there's already a separate shared_deps
> and static_deps variables holding the deps that are used with
> shared_library and static_library respectively.
>
> ty
>
Not sure I know the context of the question myself, but your answer
certainly seems reasonable. :-) Thanks.
