From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by dpdk.org (Postfix) with ESMTP id DCF717EB4 for ; Wed, 9 May 2018 02:26:13 +0200 (CEST) Received: by mail-pl0-f68.google.com with SMTP id ay10-v6so3203849plb.1 for ; Tue, 08 May 2018 17:26:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Lo833Myxad59WZI2Qgy+COHQ2CrABdwdGrARNBSd77Q=; b=Ap/bxGG6cYBa5Mrp+1dq045RNv/YDH2dAKDR34ofkiVA95MYFm/2V5vYDqsrq1fKRv 6/02H/UArfbRTqYnqJ2w63C9QFU2HjijQDdanoCkTGzKi9Nsccr6rRJCZ1o0bo4L/DLe wgHZTVzWsXyU/OtG+9Z+DYO3G/gT5Kxi5nYV7FkTTdyOTUY8UaGsNWaQl86JDIdR7Ehl vhpMRHPdHc/P8r795tkEeH2SeTh3cqAL7XbJuvE+/2tEMBE7NNzHUiJXny5cuITdCUI4 sDp9eo3BukobY5UfnrkWH/NylrWcE48ucEvJO3Fcoa62BNEMI5x3sCzr+qq7LpES3Vhf qpAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Lo833Myxad59WZI2Qgy+COHQ2CrABdwdGrARNBSd77Q=; b=oftNhyBjGxH4lLsSstQwHCcM8RMaocfB4AK3EAq2BToiQwkVHX3fS0urJzFmOBJ1Cc aGm/1FgY7XnKr7yG/DrX/5A11N+kew2QEQW+tdM3xq2C0yJmDtS3DKV9bBvWpKaJ+iny 84jfie3r2hn+4cmzbXg9yKhNsyCFv1EXg1xP7hzRqnvGH/YfWwAPRgXMOsi8MyqIGBvA TweZDtkIK/XjDSoz7HH6raC9Bbm0rj05jGIWhjTrVAsp+xFYjdt4LRaEneBWsTQZ7Ui9 GTWjW83bhUlqdIyanEZRfdMrZKJUd27TNYRERIEY9V73gb9BXau5JPBp0pObXLA3IpUd MfQQ== X-Gm-Message-State: ALQs6tAoQnG3Tewgg49FGJX5Nv/8Jsfd4sxM9EguFc/WPfJkclT/7Qxx CblelAG+9lqjZBw1LU8hAv8xbabJNsc= X-Google-Smtp-Source: AB8JxZo2+kfg0FqOXT4yhqb1QWCaaZfzBFuDZB+w7kXnjLmU0baPFrK09zSNj60o2GqefcrXDHL7xw== X-Received: by 2002:a17:902:a24:: with SMTP id 33-v6mr43839474plo.72.1525825572762; Tue, 08 May 2018 17:26:12 -0700 (PDT) Received: from xeon-e3.lan (204-195-35-107.wavecable.com. [204.195.35.107]) by smtp.gmail.com with ESMTPSA id f29sm52486712pff.169.2018.05.08.17.26.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 May 2018 17:26:11 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 8 May 2018 17:26:05 -0700 Message-Id: <20180509002605.30996-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180509002605.30996-1-stephen@networkplumber.org> References: <20180509002605.30996-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v4 4/4] bus/vmbus and net/netvsc: add meson build support X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 May 2018 00:26:14 -0000 From: Stephen Hemminger Update meson build files for new netvsc and vmbus drivers. Signed-off-by: Stephen Hemminger --- config/meson.build | 7 +++++++ drivers/bus/meson.build | 2 +- drivers/bus/vmbus/meson.build | 16 ++++++++++++++++ drivers/net/meson.build | 2 +- drivers/net/netvsc/meson.build | 13 +++++++++++++ 5 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 drivers/bus/vmbus/meson.build create mode 100644 drivers/net/netvsc/meson.build diff --git a/config/meson.build b/config/meson.build index 5815b56021b1..9900157143e1 100644 --- a/config/meson.build +++ b/config/meson.build @@ -49,6 +49,13 @@ if host_machine.system() == 'linux' and cc.find_library('bsd', required: false). dpdk_extra_ldflags += '-lbsd' endif +# vmbus depends on lib uuid +uuid_dep = cc.find_library('uuid', required: false) +if uuid_dep.found() and cc.has_header('uuid/uuid.h') + add_project_link_arguments('-luuid', language: 'c') + dpdk_extra_ldflags += '-luuid' +endif + # add -include rte_config to cflags add_project_arguments('-include', 'rte_config.h', language: 'c') diff --git a/drivers/bus/meson.build b/drivers/bus/meson.build index 58dfbe2b24dd..720eecef0577 100644 --- a/drivers/bus/meson.build +++ b/drivers/bus/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation -drivers = ['dpaa', 'fslmc', 'pci', 'vdev'] +drivers = ['dpaa', 'fslmc', 'pci', 'vdev', 'vmbus'] std_deps = ['eal'] config_flag_fmt = 'RTE_LIBRTE_@0@_BUS' driver_name_fmt = 'rte_bus_@0@' diff --git a/drivers/bus/vmbus/meson.build b/drivers/bus/vmbus/meson.build new file mode 100644 index 000000000000..8a17be828a32 --- /dev/null +++ b/drivers/bus/vmbus/meson.build @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: BSD-3-Clause + +install_headers('rte_bus_vmbus.h','rte_vmbus_reg.h') + +sources = files('vmbus_common.c', + 'vmbus_channel.c', + 'vmbus_bufring.c', + 'vmbus_common_uio.c') + +if host_machine.system() == 'linux' + sources += files('linux/vmbus_bus.c', + 'linux/vmbus_uio.c') + includes += include_directories('linux') +else + build = false +endif diff --git a/drivers/net/meson.build b/drivers/net/meson.build index b7d00a04c8ef..74d6c0f7cabf 100644 --- a/drivers/net/meson.build +++ b/drivers/net/meson.build @@ -3,7 +3,7 @@ drivers = ['af_packet', 'axgbe', 'bonding', 'dpaa', 'dpaa2', 'e1000', 'enic', 'fm10k', 'i40e', 'ixgbe', - 'mvpp2', 'null', 'octeontx', 'pcap', 'ring', + 'mvpp2', 'netvsc', 'null', 'octeontx', 'pcap', 'ring', 'sfc', 'thunderx', 'virtio'] std_deps = ['ethdev', 'kvargs'] # 'ethdev' also pulls in mbuf, net, eal etc std_deps += ['bus_pci'] # very many PMDs depend on PCI, so make std diff --git a/drivers/net/netvsc/meson.build b/drivers/net/netvsc/meson.build new file mode 100644 index 000000000000..44926b20e973 --- /dev/null +++ b/drivers/net/netvsc/meson.build @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2018 Microsoft Corporation + +version = 2 + +allow_experimental_apis = true + +sources = files('hn_ethdev.c', + 'hn_rxtx.c', + 'hn_rndis.c', + 'hn_nvs.c') + +deps += ['bus_vmbus' ] -- 2.17.0