From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pl0-f67.google.com (mail-pl0-f67.google.com [209.85.160.67]) by dpdk.org (Postfix) with ESMTP id CA530AABC for ; Tue, 17 Apr 2018 23:53:32 +0200 (CEST) Received: by mail-pl0-f67.google.com with SMTP id bj1-v6so12740845plb.8 for ; Tue, 17 Apr 2018 14:53:32 -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=wJ3JoHCl/ssvCGTMNobyYFmmnRw9ik0fguiyzlucv9s=; b=y3BR8r7bGTK3VPnWIqF/l4MeBmibIQv0HlcvcsGvAe/p5rTITTumpH+P7m8Uxng+Uw O3Ozo00stw6BOQRzkSOXdHI9eS4xifV4O7E7HcFnTbdls7DVp6ZP48IMDqGxhsFfbCZ4 QHw1XggKNoYJF2Ae1osOuw8OBr6LetUfDF56sMTJZfjiNE4ZqsTSkK0U2mOUZlJvJXEx jkcU8r4jXhZsmVU89aBMbhROUrM5Bwq1O9IivjL0mwgKGo7ZVOWUniqeXvAk3PqcWFur 8+8OWMX85SOzEWMvlevMa77VpaVZGP93aBq0Y+pQXWKUt+peE3JGgmmXF9IHwvVZNEfY Dibw== 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=wJ3JoHCl/ssvCGTMNobyYFmmnRw9ik0fguiyzlucv9s=; b=gf/bzlq8TAgswZw6qERu7K10muJt96qYH89L79iwoiyJroNvSGJM6a+gpdUY3tHFPG qsVuJKagaJEEpflzn0YBjzJs1WEx+9CLUf5IWIwXB/2GoEBD6ZYZAK+3s1rGwXSrqiv/ H6iL4FZjTvTzaQDpVS/JUuut28dKPVhMDCQy/MRlKbbFP/iJ5TfEue2Zbt+7dX011Cbh T61F4/gzu8kSotDxvuJQP5I/YcNY3C0B2JZtydxMae1YFgOTil7MwXMRVgnJQJQSEh9u rkdYHEtygue4XNOxGWhsIVttL46xvX5VsUGpav3DET9do/vRsGhXr5wW1tGh4PY7oGaH rPJA== X-Gm-Message-State: ALQs6tCSDFzCCVoR7WG3OEiNPhpW/sP5LFm9joIZplzQgM9Up6++qYBi Xbmxf66C+8tWhuYk/FAv+LLXdf1NQm8= X-Google-Smtp-Source: AIpwx4/4PvdrkbT3rkcLyqsWJYPNqx4l0XAwoZxuUcUvdyMksrq81vqTcT/9p+ZXy7uhpVeTuqG2mw== X-Received: by 2002:a17:902:3c5:: with SMTP id d63-v6mr3540817pld.163.1524002011689; Tue, 17 Apr 2018 14:53:31 -0700 (PDT) Received: from xeon-e3.lan (204-195-71-95.wavecable.com. [204.195.71.95]) by smtp.gmail.com with ESMTPSA id c3sm32785533pfd.28.2018.04.17.14.53.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Apr 2018 14:53:30 -0700 (PDT) From: Stephen Hemminger X-Google-Original-From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Tue, 17 Apr 2018 14:53:24 -0700 Message-Id: <20180417215324.8576-5-sthemmin@microsoft.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180417215324.8576-1-sthemmin@microsoft.com> References: <20180417215324.8576-1-sthemmin@microsoft.com> Subject: [dpdk-dev] [PATCH v3 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: Tue, 17 Apr 2018 21:53:33 -0000 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 | 17 +++++++++++++++++ drivers/net/meson.build | 2 +- drivers/net/netvsc/meson.build | 13 +++++++++++++ 5 files changed, 39 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 77af5d897da2..a14213b86818 100644 --- a/config/meson.build +++ b/config/meson.build @@ -45,6 +45,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..05700254fc34 --- /dev/null +++ b/drivers/bus/vmbus/meson.build @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: BSD-3-Clause + +install_headers('rte_bus_vmbus.h','rte_vmbus_reg.h') + +allow_experimental_apis = true +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 b7cac4a4a1f5..513c9d9e55c6 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', - 'null', 'octeontx', 'pcap', 'ring', + '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