From: Bruce Richardson <bruce.richardson@intel.com>
To: Stephen Hemminger <stephen@networkplumber.org>
Cc: dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v2] build: add definitions for use as meson subproject
Date: Fri, 5 Nov 2021 18:11:07 +0000 [thread overview]
Message-ID: <YYVzu7U2jVitIIGm@bricha3-MOBL.ger.corp.intel.com> (raw)
In-Reply-To: <20211105172213.103988-1-stephen@networkplumber.org>
On Fri, Nov 05, 2021 at 10:22:13AM -0700, Stephen Hemminger wrote:
> Some other projects using meson may not be able to use DPDK
> using the standard distribution pkg-config mechanism.
> Meson supports a way to handle this via the subproject
> https://mesonbuild.com/Subprojects.html
>
> This patch adds the necessary dependency to follow the
> "Naming convention for dependency variables" from the documentation.
>
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
One comment inline below. Otherwise:
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
>
> v2 - add link libraries
>
> lib/meson.build | 5 +++++
> meson.build | 13 +++++++++++++
> 2 files changed, 18 insertions(+)
>
> diff --git a/lib/meson.build b/lib/meson.build
> index 499d26060fdd..e6df538bd6ef 100644
> --- a/lib/meson.build
> +++ b/lib/meson.build
> @@ -241,6 +241,11 @@ foreach l:libraries
>
> dpdk_libraries = [shared_lib] + dpdk_libraries
> dpdk_static_libraries = [static_lib] + dpdk_static_libraries
> + if get_option('default_library') == 'static'
> + dpdk_libs_deps += static_dep
> + else
> + dpdk_libs_deps += shared_dep
> + endif
>
> set_variable('shared_rte_' + name, shared_dep)
> set_variable('static_rte_' + name, static_dep)
> diff --git a/meson.build b/meson.build
> index 12cb6e0e83f3..3bf6bb794ce1 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -36,6 +36,7 @@ dpdk_drivers = []
> dpdk_extra_ldflags = []
> dpdk_libs_disabled = []
> dpdk_drvs_disabled = []
> +dpdk_libs_deps = []
> abi_version_file = files('ABI_VERSION')
>
> if host_machine.cpu_family().startswith('x86')
> @@ -97,6 +98,18 @@ configure_file(output: build_cfg,
> # build pkg-config files for dpdk
> subdir('buildtools/pkg-config')
>
> +# If DPDK is being built as subproject then define
> +# variable with the dependency convention
> +if meson.is_subproject()
> + libdpdk_dep = declare_dependency(
> + version: meson.project_version(),
> + compile_args : pkg_extra_cflags,
> + dependencies: dpdk_libs_deps,
> + link_args: dpdk_extra_ldflags,
> + link_with: dpdk_libraries
Minor nit, but the dpdk_libraries is always the shared libs, it's
dpdk_static_libraries in the static case. Since elsewhere you switched on
the "default_library" value, maybe you should do so here.
Personally, I'd tend more towards having two new vars, "dpdk_libs_deps" and
"dpdk_static_libs_deps", and then define two global dependency objects:
"libdpdk_dep" and "libdpdk_static_dep", to make it easy for subprojects to
pull in the one they want.
> + )
> +endif
> +
> # final output, list all the libs and drivers to be built
> # this does not affect any part of the build, for information only.
> output_message = '\n=================\nLibraries Enabled\n=================\n'
> --
> 2.30.2
>
next prev parent reply other threads:[~2021-11-05 18:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-03 22:12 [dpdk-dev] [RFC] build: allow build DPDK as a meson submodule Stephen Hemminger
2021-11-04 8:59 ` Bruce Richardson
2021-11-05 0:01 ` [dpdk-dev] [PATCH] " Stephen Hemminger
2021-11-05 14:58 ` Bruce Richardson
2021-11-05 16:17 ` Stephen Hemminger
2021-11-05 17:22 ` [dpdk-dev] [PATCH v2] build: add definitions for use as meson subproject Stephen Hemminger
2021-11-05 18:11 ` Bruce Richardson [this message]
2022-02-02 20:59 ` Thomas Monjalon
2022-05-06 14:06 ` Bruce Richardson
2022-05-06 14:43 ` [PATCH v3] " Bruce Richardson
2022-05-21 0:54 ` Ben Magistro
2022-06-07 16:05 ` Thomas Monjalon
2022-04-18 14:48 [dpdk-dev] [PATCH v2] " Ben Magistro
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=YYVzu7U2jVitIIGm@bricha3-MOBL.ger.corp.intel.com \
--to=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=stephen@networkplumber.org \
/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).