From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by dpdk.org (Postfix) with ESMTP id CFCFC1BB93 for ; Tue, 15 May 2018 06:32:11 +0200 (CEST) Received: by mail-pf0-f196.google.com with SMTP id p12-v6so7054071pff.13 for ; Mon, 14 May 2018 21:32:11 -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=Sv5npA99HW6kdcMPlrXCf9qbYo14Z5xEJsn2NB1sl1g=; b=W05XwXRR1lrmnbEsAzY9LMYCVVTYv3MTcx9CQNyGQ8dSxb9B1HCarch1FN5Bh8e6So 5c1NJZH+1XMaVmcXrPtvuXy5E/qpP4ioWIYDK/yXzTvsTbNKLlFEc0bkmnewMbXP+wrz rx0r+7iN/8S5l3kKRLJ89RPDicl7pnpGKALbJdAQKwDBKyoWpM8fpuoFmd73s+Y+E8r8 igtp04AkFJhjdtpBcA/0Bms3Rj3xCmo2B8jJ73feXcLAp/c8Fx5gun/NoGyg+sBHREP4 sbgavLxpSl4YO6Gb3Mg7BIMftk7LFqRQXf+HOitd6ew/cyqc6ize3Opp2TEtRybQlwxx begQ== 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=Sv5npA99HW6kdcMPlrXCf9qbYo14Z5xEJsn2NB1sl1g=; b=sZ/0+mpYJZaeAo3LoApV1djZV3Olx6LGieHZ35v+692iTdYB9piOGyeF9/K7YNG1tm DyKb3lz5beQgDUNSY2D6nDPo8ZgQcMva03EczLm1dcnyDRz2JwXeqT/55dBDicQ7eahh mtP1oOMRxO8GFLCPmHdrNWFgdCjbyqRW+3IZgXFqF2bn+9jaCDFAK/GcNxGwpEHskIsQ Nk6rXhdnLcmtXM9dK+FItZyW308cDaHR3Sbd1obURAZ0SHagwO3bcfjmDU04Fop79Til rv9RiH655/yuez2rrs3WHkbdYk73qQ3OISBAZGtQEO15++S0X55UPXrCm64PGw97u0+O xBYQ== X-Gm-Message-State: ALKqPwczM0td3ePMCyqMevxSaSMQC+hR9eTeTSHJe9swBce01LUWxOKs ypCRxg88iGdPZQyUL2vmh6w4k/cOTJU= X-Google-Smtp-Source: AB8JxZqKL/pj3KVYCGhtlkG7vFhDgnketBH+ZBWwWtG96PUpEDL+1vblamgz5pAcuDkY+bIh36B5PQ== X-Received: by 2002:a63:9a49:: with SMTP id e9-v6mr11032146pgo.251.1526358730743; Mon, 14 May 2018 21:32:10 -0700 (PDT) Received: from xeon-e3.lan (204-195-35-107.wavecable.com. [204.195.35.107]) by smtp.gmail.com with ESMTPSA id t80-v6sm20535983pfg.0.2018.05.14.21.32.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 14 May 2018 21:32:10 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Mon, 14 May 2018 21:31:54 -0700 Message-Id: <20180515043154.19239-6-stephen@networkplumber.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180515043154.19239-1-stephen@networkplumber.org> References: <20180515043154.19239-1-stephen@networkplumber.org> Subject: [dpdk-dev] [PATCH v7 5/5] 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: Tue, 15 May 2018 04:32:12 -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 2179c689c14d..34759d505881 100644 --- a/config/meson.build +++ b/config/meson.build @@ -50,6 +50,13 @@ if host_machine.system() == 'linux' and cc.find_library('bsd', 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 52c755dcfd8e..80de2d91d52d 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', 'ifpga', 'pci', 'vdev'] +drivers = ['dpaa', 'fslmc', 'ifpga', '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