[dpdk-dev] lib/librte_vhost: fix meson build

Message ID 20180406124308.56987-1-roy.fan.zhang@intel.com (mailing list archive)
State Not Applicable, archived
Delegated to: Maxime Coquelin
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail apply issues

Commit Message

Fan Zhang April 6, 2018, 12:43 p.m. UTC
  Fixes: 7834b5c82bf3 ("lib/librte_vhost: update makefile")

This patch fixes some meson build bugs.

Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
---
 lib/librte_vhost/meson.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Comments

Maxime Coquelin April 6, 2018, 1:07 p.m. UTC | #1
On 04/06/2018 02:43 PM, Fan Zhang wrote:
> Fixes: 7834b5c82bf3 ("lib/librte_vhost: update makefile")
> 
> This patch fixes some meson build bugs.
> 
> Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
> ---
>   lib/librte_vhost/meson.build | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/librte_vhost/meson.build b/lib/librte_vhost/meson.build
> index f01ef67fc..dee154e40 100644
> --- a/lib/librte_vhost/meson.build
> +++ b/lib/librte_vhost/meson.build
> @@ -10,6 +10,6 @@ endif
>   version = 4
>   allow_experimental_apis = true
>   sources = files('fd_man.c', 'iotlb.c', 'socket.c', 'vhost.c', 'vhost_user.c',
> -		'virtio_net.c', 'virtio_crypto.c')
> +		'virtio_net.c', 'vhost_crypto.c')
>   headers = files('rte_vhost.h', 'rte_vhost_crypto.h')
> -deps += ['ethdev', 'cryptodev', 'pci']
> +deps += ['ethdev', 'cryptodev', 'pci', 'hash']
> 

Acked-by: Maxime Coquelin <maxime.coquelin@redhat.com>

I will squash the change in patch 7834b5c82bf3 if not applied yet.

As discussed on IRC, we should ideally have such dependencies only if
vhost-crypto build is enabled.

Thanks!
Maxime
  
Maxime Coquelin April 9, 2018, 3:51 p.m. UTC | #2
On 04/06/2018 02:43 PM, Fan Zhang wrote:
> Fixes: 7834b5c82bf3 ("lib/librte_vhost: update makefile")
> 
> This patch fixes some meson build bugs.
> 
> Signed-off-by: Fan Zhang <roy.fan.zhang@intel.com>
> ---
>   lib/librte_vhost/meson.build | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/librte_vhost/meson.build b/lib/librte_vhost/meson.build
> index f01ef67fc..dee154e40 100644
> --- a/lib/librte_vhost/meson.build
> +++ b/lib/librte_vhost/meson.build
> @@ -10,6 +10,6 @@ endif
>   version = 4
>   allow_experimental_apis = true
>   sources = files('fd_man.c', 'iotlb.c', 'socket.c', 'vhost.c', 'vhost_user.c',
> -		'virtio_net.c', 'virtio_crypto.c')
> +		'virtio_net.c', 'vhost_crypto.c')
>   headers = files('rte_vhost.h', 'rte_vhost_crypto.h')
> -deps += ['ethdev', 'cryptodev', 'pci']
> +deps += ['ethdev', 'cryptodev', 'pci', 'hash']
> 

Squashed into offending commit!

Thanks,
Maxime
  

Patch

diff --git a/lib/librte_vhost/meson.build b/lib/librte_vhost/meson.build
index f01ef67fc..dee154e40 100644
--- a/lib/librte_vhost/meson.build
+++ b/lib/librte_vhost/meson.build
@@ -10,6 +10,6 @@  endif
 version = 4
 allow_experimental_apis = true
 sources = files('fd_man.c', 'iotlb.c', 'socket.c', 'vhost.c', 'vhost_user.c',
-		'virtio_net.c', 'virtio_crypto.c')
+		'virtio_net.c', 'vhost_crypto.c')
 headers = files('rte_vhost.h', 'rte_vhost_crypto.h')
-deps += ['ethdev', 'cryptodev', 'pci']
+deps += ['ethdev', 'cryptodev', 'pci', 'hash']