patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH] eal: move compat includes to common meson file
@ 2019-01-09 17:18 Anatoly Burakov
  2019-01-09 17:29 ` David Marchand
  0 siblings, 1 reply; 3+ messages in thread
From: Anatoly Burakov @ 2019-01-09 17:18 UTC (permalink / raw)
  To: dev; +Cc: thomas, bruce.richardson, david.marchand, stable

Currently, while EAL does depend on librte_compat as far as common
meson build is concerned, for some reason the headers for that
library are not added into the list of includes. This is fixed in
Linuxapp-specific meson file, but is absent from FreeBSD meson file.

This worked fine up until recently, when an rte_compat dependency
was added to rte_log, which is a common header. Fix this issue by
adding librte_compat includes to common EAL meson file.

Fixes: 844514c73569 ("eal: build with meson")
Fixes: a8499f65a1d1 ("log: add missing experimental tag")
Cc: bruce.richardson@intel.com
Cc: david.marchand@redhat.com
Cc: stable@dpdk.org

Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 lib/librte_eal/linuxapp/eal/meson.build | 2 +-
 lib/librte_eal/meson.build              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/librte_eal/linuxapp/eal/meson.build b/lib/librte_eal/linuxapp/eal/meson.build
index 6e31c2aaa..7e68b2c0d 100644
--- a/lib/librte_eal/linuxapp/eal/meson.build
+++ b/lib/librte_eal/linuxapp/eal/meson.build
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-eal_inc += include_directories('include', '../../../librte_compat')
+eal_inc += include_directories('include')
 install_subdir('include/exec-env', install_dir: get_option('includedir'))
 
 env_objs = []
diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build
index a18f3a826..67e26de8d 100644
--- a/lib/librte_eal/meson.build
+++ b/lib/librte_eal/meson.build
@@ -4,7 +4,7 @@
 # Custom EAL processing. EAL is complicated enough that it can't just
 # have a straight list of headers and source files.
 # Initially pull in common settings
-eal_inc = [global_inc]
+eal_inc = [global_inc, include_directories('../librte_compat')]
 subdir('common') # defines common_sources, common_objs, etc.
 
 # Now do OS/exec-env specific settings, including building kernel modules
-- 
2.17.1

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-stable] [PATCH] eal: move compat includes to common meson file
  2019-01-09 17:18 [dpdk-stable] [PATCH] eal: move compat includes to common meson file Anatoly Burakov
@ 2019-01-09 17:29 ` David Marchand
  2019-01-09 20:51   ` Bruce Richardson
  0 siblings, 1 reply; 3+ messages in thread
From: David Marchand @ 2019-01-09 17:29 UTC (permalink / raw)
  To: Anatoly Burakov; +Cc: dev, Thomas Monjalon, bruce.richardson, stable

On Wed, Jan 9, 2019 at 6:18 PM Anatoly Burakov <anatoly.burakov@intel.com>
wrote:

> Currently, while EAL does depend on librte_compat as far as common
> meson build is concerned, for some reason the headers for that
> library are not added into the list of includes. This is fixed in
> Linuxapp-specific meson file, but is absent from FreeBSD meson file.
>
> This worked fine up until recently, when an rte_compat dependency
> was added to rte_log, which is a common header. Fix this issue by
> adding librte_compat includes to common EAL meson file.
>
> Fixes: 844514c73569 ("eal: build with meson")
> Fixes: a8499f65a1d1 ("log: add missing experimental tag")
> Cc: bruce.richardson@intel.com
> Cc: david.marchand@redhat.com
> Cc: stable@dpdk.org
>
> Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
>

lgtm, thanks.

Reviewed-by: David Marchand <david.marchand@redhat.com>


-- 
David Marchand

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [dpdk-stable] [PATCH] eal: move compat includes to common meson file
  2019-01-09 17:29 ` David Marchand
@ 2019-01-09 20:51   ` Bruce Richardson
  0 siblings, 0 replies; 3+ messages in thread
From: Bruce Richardson @ 2019-01-09 20:51 UTC (permalink / raw)
  To: David Marchand; +Cc: Anatoly Burakov, dev, Thomas Monjalon, stable

On Wed, Jan 09, 2019 at 06:29:32PM +0100, David Marchand wrote:
>    On Wed, Jan 9, 2019 at 6:18 PM Anatoly Burakov
>    <[1]anatoly.burakov@intel.com> wrote:
> 
>      Currently, while EAL does depend on librte_compat as far as common
>      meson build is concerned, for some reason the headers for that
>      library are not added into the list of includes. This is fixed in
>      Linuxapp-specific meson file, but is absent from FreeBSD meson file.
>      This worked fine up until recently, when an rte_compat dependency
>      was added to rte_log, which is a common header. Fix this issue by
>      adding librte_compat includes to common EAL meson file.
>      Fixes: 844514c73569 ("eal: build with meson")
>      Fixes: a8499f65a1d1 ("log: add missing experimental tag")
>      Cc: [2]bruce.richardson@intel.com
>      Cc: [3]david.marchand@redhat.com
>      Cc: [4]stable@dpdk.org
>      Signed-off-by: Anatoly Burakov <[5]anatoly.burakov@intel.com>
> 
>    lgtm, thanks.
>    Reviewed-by: David Marchand <[6]david.marchand@redhat.com>
>    --
>    David Marchand
> 
Agreed.
One other point I'd make is that having compat as a separate library seems
a little like overkill to me - it's just one header file! Is there a reason
why we don't just move it into the EAL where everyone can use it without
having to specify another dependency?

/Bruce

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-01-09 20:52 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-01-09 17:18 [dpdk-stable] [PATCH] eal: move compat includes to common meson file Anatoly Burakov
2019-01-09 17:29 ` David Marchand
2019-01-09 20:51   ` Bruce Richardson

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).