From patchwork Mon Aug 12 23:03:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 57628 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 82A021BE82; Tue, 13 Aug 2019 01:04:14 +0200 (CEST) Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by dpdk.org (Postfix) with ESMTP id 9224F1BDFD; Tue, 13 Aug 2019 01:04:13 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 1A1D8489; Mon, 12 Aug 2019 19:04:12 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 12 Aug 2019 19:04:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=inMJ0UPQZc t2BdqUntUgjfFwltYEr0m0XlIFQHz3cGc=; b=dvqR4f7q3thn40lpYzbYK8lCwD MDe14qz4PRXKcWtb3PDkXovtP3CqHZEtpbuJctZqTVzOlB0MGRllt+3hamJf8bVY UUSdsu1+eam1DUiulsEUFIX3BNyflUzDyMn72Iu5g5uo85DtKRBaFT/usMM6UAoM R/64+cu6bOyHLBD4c= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=inMJ0UPQZct2BdqUntUgjfFwltYEr0m0XlIFQHz3cGc=; b=Sn92zPAB wO/MLi2eP2qsfx/bkMbXx15og79wKeSkx1f313ZIJBbKNzM9bSagx33t09cuS5xD tpQSF++4hJObVVWpRk+sJw6kH36x0SOdaEQk2TdtIlNaxSSU3Ms+RHxW1vWCfCXd Wt+j7uEZqUXA9GLVBAuRNMO659nu+CaCTcFnIWUXwbP7Eic9aYZcWWsSQF97ZTVo jy4k9wujvtBOH7dj9jHGNFyz3mEOZqaXfPAt7xpXtOkX14zKEQb7/F+jnrc7Lx4x sgUpCeJhrHMGRnJfkbKbyrrTyJwCcVUiNiYWYoSWoZiAqmM5IqtJGwxy3YMnO20X lU4t/GpMKx8zYQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddruddvhedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecukf hppeejjedrudefgedrvddtfedrudekgeenucfrrghrrghmpehmrghilhhfrhhomhepthhh ohhmrghssehmohhnjhgrlhhonhdrnhgvthenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 078F780061; Mon, 12 Aug 2019 19:04:09 -0400 (EDT) From: Thomas Monjalon To: bruce.richardson@intel.com, Lee Daly , Fiona Trahe , Pablo de Lara , Ashish Gupta , Xiaolong Ye , Qi Zhang Cc: dev@dpdk.org, bluca@debian.org, stable@dpdk.org Date: Tue, 13 Aug 2019 01:03:53 +0200 Message-Id: <20190812230358.988-2-thomas@monjalon.net> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190812230358.988-1-thomas@monjalon.net> References: <20190812230358.988-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 1/6] build: remove redundant libs from pkgconfig 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" As explained in drivers/meson.build, " For the find_library() case (but not with dependency()) we also need to specify the "-l" flags in pkgconfig_extra_libs variable too, so that it can be reflected in the pkgconfig output for static builds. " The commit e30b4e566f47 ("build: improve dependency handling") must be followed up with this one in order to remove more occurences of pkgconfig_extra_libs redundant with use of dependency(). Fixes: f1debd77efaf ("net/af_xdp: introduce AF_XDP PMD") Cc: xiaolong.ye@intel.com Fixes: 3c32e89f68e1 ("compress/isal: add skeleton ISA-L compression PMD") Cc: lee.daly@intel.com Cc: bluca@debian.org Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon Acked-by: Luca Boccassi --- drivers/compress/isal/meson.build | 1 - drivers/net/af_xdp/meson.build | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/compress/isal/meson.build b/drivers/compress/isal/meson.build index 67b5c4aae..25578880d 100644 --- a/drivers/compress/isal/meson.build +++ b/drivers/compress/isal/meson.build @@ -10,6 +10,5 @@ endif deps += 'bus_vdev' sources = files('isal_compress_pmd.c', 'isal_compress_pmd_ops.c') ext_deps += dep -pkgconfig_extra_libs += '-lisal' allow_experimental_apis = true diff --git a/drivers/net/af_xdp/meson.build b/drivers/net/af_xdp/meson.build index ac679b92b..307aa0e38 100644 --- a/drivers/net/af_xdp/meson.build +++ b/drivers/net/af_xdp/meson.build @@ -10,7 +10,6 @@ endif if bpf_dep.found() and cc.has_header('bpf/xsk.h') and cc.has_header('linux/if_xdp.h') ext_deps += bpf_dep - pkgconfig_extra_libs += '-lbpf' else build = false reason = 'missing dependency, "libbpf"' From patchwork Mon Aug 12 23:03:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 57629 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B306D1BE8C; Tue, 13 Aug 2019 01:04:16 +0200 (CEST) Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by dpdk.org (Postfix) with ESMTP id 1D2E0DE3 for ; Tue, 13 Aug 2019 01:04:15 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id ECCB7483; Mon, 12 Aug 2019 19:04:13 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 12 Aug 2019 19:04:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=Fqca7VRO/y 60KRv98B/kcjlqnUxjIHAGKwiUp6Plns4=; b=Az9dt8uUrr2qgfARtuyxQHjcgn q0aAbOMw/qCkt5bYHAT5ngvmydtdvrNInI8LpXu43e9PDRa1nAMQSfEYbqjmwuYL VXqAPmA3w6hz609IobsADro4SV8IWwY79o+1BWa0u/gG+vMcoCAMni0US+d6YLVQ dp/tI4G+0JjG7B1yE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=Fqca7VRO/y60KRv98B/kcjlqnUxjIHAGKwiUp6Plns4=; b=cb6zjZIc pa6KWqNQn5cVhxgZ3QdbNk/PJS5xYybL4iGTXEBElB5ltn37JZOkrhQW3lbmSd7q zo2FG9y/TUZdP9YQ/Bb9ceiqI3OHk6b7duRKdL3dB3fnhKdtLbDWJePU0FlSBc/g jnUPLlSek5icy6q5YScjt1i66dZ1uKlcTGdrrrdd1AI8oYHRLY0tPx7d1Uf4rZxC aJZ8EqvF25dQk5EMA7t/4vMPlAQC39qfU45jZg7jaAgVghw4+CDHVnQoc+5p/wQN lJ+No2BOQV1m7SgGeRHjeenoO7SG+2YuaRlDoH9PMi02t2DOJ9StTkxCRw3sYBmI /lDxCTaUt3QhFw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddruddvhedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecukf hppeejjedrudefgedrvddtfedrudekgeenucfrrghrrghmpehmrghilhhfrhhomhepthhh ohhmrghssehmohhnjhgrlhhonhdrnhgvthenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id CA41380062; Mon, 12 Aug 2019 19:04:12 -0400 (EDT) From: Thomas Monjalon To: bruce.richardson@intel.com, Nicolas Chautru , Jakub Grajciar Cc: dev@dpdk.org Date: Tue, 13 Aug 2019 01:03:54 +0200 Message-Id: <20190812230358.988-3-thomas@monjalon.net> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190812230358.988-1-thomas@monjalon.net> References: <20190812230358.988-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 2/6] drivers: add some reasons for meson disabling 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Some drivers were missing reasons text for their disabling in meson. Signed-off-by: Thomas Monjalon Acked-by: Luca Boccassi --- drivers/baseband/turbo_sw/meson.build | 1 + drivers/net/memif/meson.build | 5 +++-- drivers/raw/ioat/meson.build | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/baseband/turbo_sw/meson.build b/drivers/baseband/turbo_sw/meson.build index 33345aa01..1a1f7c9a9 100644 --- a/drivers/baseband/turbo_sw/meson.build +++ b/drivers/baseband/turbo_sw/meson.build @@ -7,6 +7,7 @@ if dpdk_conf.has('RTE_BBDEV_SDK_AVX2') lib = cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: false) if not lib.found() build = false + reason = 'missing dependency, "libturbo"' else ext_deps += cc.find_library('libturbo', dirs: [path + '/lib_turbo'], required: true) ext_deps += cc.find_library('libcrc', dirs: [path + '/lib_crc'], required: true) diff --git a/drivers/net/memif/meson.build b/drivers/net/memif/meson.build index bedc97311..a44d82535 100644 --- a/drivers/net/memif/meson.build +++ b/drivers/net/memif/meson.build @@ -1,8 +1,9 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018-2019 Cisco Systems, Inc. All rights reserved. -if host_machine.system() != 'linux' - build = false +if not is_linux + build = false + reason = 'only supported on Linux' endif sources = files('rte_eth_memif.c', diff --git a/drivers/raw/ioat/meson.build b/drivers/raw/ioat/meson.build index 247ff88bf..0878418ae 100644 --- a/drivers/raw/ioat/meson.build +++ b/drivers/raw/ioat/meson.build @@ -2,6 +2,7 @@ # Copyright 2019 Intel Corporation build = dpdk_conf.has('RTE_ARCH_X86') +reason = 'only supported on x86' sources = files('ioat_rawdev.c', 'ioat_rawdev_test.c') deps += ['rawdev', 'bus_pci', 'mbuf'] From patchwork Mon Aug 12 23:03:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 57630 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 94EFC1BE94; Tue, 13 Aug 2019 01:04:18 +0200 (CEST) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by dpdk.org (Postfix) with ESMTP id 380241BDFD; Tue, 13 Aug 2019 01:04:17 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 8B0CA22076; Mon, 12 Aug 2019 19:04:16 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 12 Aug 2019 19:04:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=f4vMD1g1rj 211mrM0GlGrdCu2+9IPXPMZnNjJDzEMpo=; b=LYHnSgcWXyuO20k9u3Bmr+dG0f 55yEvMK7EA2FtoUGhhq0cDDLWSvdXYb3sJ8AOyh+vjL6SWY+w9rRC0YFe9DR4LVr uPvXXaIAUfNTHH7CX8h8i5ds9ZfgOQu9zM7k+nVdZ5Y3inP/aQ+y0GWqCHJrzvsp p9LNWCudqSyfyaUdg= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=f4vMD1g1rj211mrM0GlGrdCu2+9IPXPMZnNjJDzEMpo=; b=eCA4MeoD ybtX7lWhYPiu7zTxuW8IHXJW4msapmwsRwVnsWguVqSPzDFq9Cl9K678J2NyJV/A LoWeN+pNDuxT8MaIeoE7/z2T4+fuYezDAWc1eC9EAM2xsot+Ax5KF8OmWoA36TIk sF/PEFn29tZnP9UQ9PrfpyRsXMVcP+cW1UvhwmD9KpUuCzloum2T1yUVwFnAA83y 5WFI6s9TfLWrtRR+zhztv7sSg9iL9XSnlphQaRmlwZdtSaQIpXokszZ0CqqVPhbT WrIC6kSgyItKY8eZDkbrsROlCXhlNzFlOokwsx5of4pcUdl4DBzH/B1zMmHCdL8H O3w7nIbQQq3hNw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddruddvhedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecukf hppeejjedrudefgedrvddtfedrudekgeenucfrrghrrghmpehmrghilhhfrhhomhepthhh ohhmrghssehmohhnjhgrlhhonhdrnhgvthenucevlhhushhtvghrufhiiigvpedv X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 12B5E80061; Mon, 12 Aug 2019 19:04:14 -0400 (EDT) From: Thomas Monjalon To: bruce.richardson@intel.com, Matan Azrad , Shahaf Shuler , Yongseok Koh , Viacheslav Ovsiienko Cc: dev@dpdk.org, stable@dpdk.org, Luca Boccassi Date: Tue, 13 Aug 2019 01:03:55 +0200 Message-Id: <20190812230358.988-4-thomas@monjalon.net> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190812230358.988-1-thomas@monjalon.net> References: <20190812230358.988-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 3/6] net/mlx: fix meson build with custom dependency path 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" If rdma-core is not installed in a standard directory of the system, it is possible to specify the location of the pkgconfig file via an environment variable: PKG_CONFIG_PATH=$PKG_CONFIG_PATH:~/rdma-core/build/lib/pkgconfig In this case, the dependency may become mandatory to specify for the configuration tests (checking dependency symbols or fields). Some spacing is also fixed around. Fixes: 8e4937640022 ("net/mlx4: add external allocator for Verbs object") Fixes: 1dd7c7e38c19 ("net/mlx4: support meson build") Fixes: 96d7c62a70c7 ("net/mlx5: support meson build") Cc: stable@dpdk.org Suggested-by: Luca Boccassi Signed-off-by: Thomas Monjalon Acked-by: Luca Boccassi Acked-by: Matan Azrad --- drivers/net/mlx4/meson.build | 9 +++++---- drivers/net/mlx5/meson.build | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build index 028cd97fa..efee45776 100644 --- a/drivers/net/mlx4/meson.build +++ b/drivers/net/mlx4/meson.build @@ -76,7 +76,7 @@ if build # mlx4_autoconf.h file is still generated. # input array for meson member search: # [ "MACRO to define if found", "header for the search", - # "symbol to search","struct member to search" ] + # "symbol to search", "struct member to search" ] # has_member_args = [ [ 'HAVE_IBV_MLX4_WQE_LSO_SEG', 'infiniband/mlx4dv.h', @@ -93,12 +93,13 @@ if build ] config = configuration_data() foreach arg:has_sym_args - config.set(arg[0], cc.has_header_symbol(arg[1], arg[2])) + config.set(arg[0], cc.has_header_symbol(arg[1], arg[2], + dependencies: libs)) endforeach foreach arg:has_member_args - file_prefix = '#include<' + arg[1] + '>' + file_prefix = '#include <' + arg[1] + '>' config.set(arg[0], cc.has_member(arg[2], arg[3], - prefix : file_prefix)) + prefix: file_prefix, dependencies: libs)) endforeach configure_file(output : 'mlx4_autoconf.h', configuration : config) endif diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index 62b41caf1..3c5144c9b 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -177,12 +177,13 @@ if build ] config = configuration_data() foreach arg:has_sym_args - config.set(arg[0], cc.has_header_symbol(arg[1], arg[2])) + config.set(arg[0], cc.has_header_symbol(arg[1], arg[2], + dependencies: libs)) endforeach foreach arg:has_member_args - file_prefix = '#include<' + arg[1] + '>' + file_prefix = '#include <' + arg[1] + '>' config.set(arg[0], cc.has_member(arg[2], arg[3], - prefix : file_prefix)) + prefix : file_prefix, dependencies: libs)) endforeach configure_file(output : 'mlx5_autoconf.h', configuration : config) endif From patchwork Mon Aug 12 23:03:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 57631 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 641711BE9B; Tue, 13 Aug 2019 01:04:22 +0200 (CEST) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by dpdk.org (Postfix) with ESMTP id 600241BE8A; Tue, 13 Aug 2019 01:04:20 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 0DF3822077; Mon, 12 Aug 2019 19:04:18 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 12 Aug 2019 19:04:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=N3qsFecWfJ yh0dg11CBwQ5z41voSfVPX0jyqzncfRoA=; b=gKd/L5yeHtCtYrybX+KI1ZZcR5 z+9YrqVhLeRZPKw6se1WoEtrgPZw/UO9Yikut0YfzRs9XdU1jYD07waieZo+b8al awhLJblpNkjU1hBtRad1L8dNtyiuNcntQ71c28W2fjL0EdyQcqRDYjxqVzkFWajo dcl5UJ8JVqJMq6kiM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=N3qsFecWfJyh0dg11CBwQ5z41voSfVPX0jyqzncfRoA=; b=Q4jUKIuj SvgOkhVYWS6ihKGB1gdUYptpTGEsxWkVC+LTtZ7+glAiP8K+3MiVmsMhu0PR7P2Y W+i50XawL43mmvozI2udvNrHBxYw/81Rtkk3T3yeZ9+S30xd835Mu5OeekJIwS3X i7dGOecw32eAiXZ7GOj5Cckwd6gwUskCAy0Ix/+va6hJGTgPMTeyiUMoPGwvYdt3 1M8aX3WicsXY4bRifGskomz+klDARpUFtndCWuyr5pnWRMcTgFFO3D4PXwD/9SME 1Kynp876b1WyZ19A9AuVbq7SH/YYehSY1ziy2EEN9eXn9cXUZK3lbxJUvWBndD+v 8/Vya1+9NkzhTg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddruddvhedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecuff homhgrihhnpehlihgsrdhmkhdprghuthhoqdgtohhnfhhighdqhhdrshhhnecukfhppeej jedrudefgedrvddtfedrudekgeenucfrrghrrghmpehmrghilhhfrhhomhepthhhohhmrg hssehmohhnjhgrlhhonhdrnhgvthenucevlhhushhtvghrufhiiigvpedt X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id A8AD08005A; Mon, 12 Aug 2019 19:04:17 -0400 (EDT) From: Thomas Monjalon To: bruce.richardson@intel.com, Matan Azrad , Shahaf Shuler , Yongseok Koh , Viacheslav Ovsiienko Cc: dev@dpdk.org, adrien.mazarguil@6wind.com, stable@dpdk.org Date: Tue, 13 Aug 2019 01:03:56 +0200 Message-Id: <20190812230358.988-5-thomas@monjalon.net> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190812230358.988-1-thomas@monjalon.net> References: <20190812230358.988-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 4/6] net/mlx: fix build with make and recent gcc 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" With VERBOSE=1, this error was seen in debug mode with gcc 9.1: In file included from /tmp/dpdk.auto-config-h.sh.c.w0VWMi:1: In file included from rdma-core/build/include/infiniband/mlx5dv.h:47: In file included from rdma-core/build/include/infiniband/verbs.h:46: In file included from rdma-core/build/include/infiniband/verbs_api.h:66: In file included from rdma-core/build/include/infiniband/ib_user_ioctl_verbs.h:38: include/rdma/ib_user_verbs.h:161:28: fatal error: zero size arrays are an extension [-Wzero-length-array] __aligned_u64 driver_data0; ^ 1 error generated. As a result, buildtools/auto-config-h.sh was not generating a correct autoconf file, so the compilation was generating such error: fatal error: redefinition of 'mlx5_ib_uapi_flow_action_packet_reformat_type' It is fixed by disabling -pedantic option when calling auto-config-h.sh from the makefile-based system. Cc: adrien.mazarguil@6wind.com Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon Acked-by: Luca Boccassi Acked-by: Matan Azrad --- drivers/net/mlx4/Makefile | 3 ++- drivers/net/mlx5/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx4/Makefile b/drivers/net/mlx4/Makefile index 8126b0dfc..25d7c7555 100644 --- a/drivers/net/mlx4/Makefile +++ b/drivers/net/mlx4/Makefile @@ -68,6 +68,7 @@ endif # User-defined CFLAGS. ifeq ($(CONFIG_RTE_LIBRTE_MLX4_DEBUG),y) CFLAGS += -pedantic -UNDEBUG -DPEDANTIC +AUTO_CONFIG_CFLAGS += -Wno-pedantic else CFLAGS += -DNDEBUG -UPEDANTIC endif @@ -77,7 +78,7 @@ include $(RTE_SDK)/mk/rte.lib.mk # Generate and clean-up mlx4_autoconf.h. export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS -export AUTO_CONFIG_CFLAGS = -Wno-error +export AUTO_CONFIG_CFLAGS += -Wno-error ifndef V AUTOCONF_OUTPUT := >/dev/null diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index dbb2a4e80..299cf3afe 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -83,6 +83,7 @@ endif # User-defined CFLAGS. ifeq ($(CONFIG_RTE_LIBRTE_MLX5_DEBUG),y) CFLAGS += -pedantic -UNDEBUG -DPEDANTIC +AUTO_CONFIG_CFLAGS += -Wno-pedantic else CFLAGS += -DNDEBUG -UPEDANTIC endif @@ -92,7 +93,7 @@ include $(RTE_SDK)/mk/rte.lib.mk # Generate and clean-up mlx5_autoconf.h. export CC CFLAGS CPPFLAGS EXTRA_CFLAGS EXTRA_CPPFLAGS -export AUTO_CONFIG_CFLAGS = -Wno-error +export AUTO_CONFIG_CFLAGS += -Wno-error ifndef V AUTOCONF_OUTPUT := >/dev/null From patchwork Mon Aug 12 23:03:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 57632 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7B7871BEA7; Tue, 13 Aug 2019 01:04:24 +0200 (CEST) Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by dpdk.org (Postfix) with ESMTP id 0F3D71BE90 for ; Tue, 13 Aug 2019 01:04:22 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id DCD134A2; Mon, 12 Aug 2019 19:04:20 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 12 Aug 2019 19:04:21 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=NnD1mgh/UF vfMH7w42BJ+s48wf5elQ2c0R6qe/k0Ol0=; b=SV6Ji5rtp9zYGvROWUQ6/EpbUp FlrzzJZDAPBer/kA2+z+dSUl3aY5PSbvFYfzUQN2Bdq5NWyqsTu8LBsW+Jcf5YhD SZPsrVbvlUrDq8mB9XzuCnVa+U6yAc7WLq+AglCtCaxU9ea7PNpedQddk2/9RVeb 21nweeQen/3I3Sdr4= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=NnD1mgh/UFvfMH7w42BJ+s48wf5elQ2c0R6qe/k0Ol0=; b=gms8GI0U rGUqoWYrK1fV5rywTwH928vhbxWEckdRJfVUVgVxF4CmrAY62mAH9AnkgWKMscvy EU7gKLikr1lPkkctjbkioyhhXIkDK0AFavUtqcCUcrSlaXr7sT+jvhrq26cVpNH7 0ZKLYkkaDkqvo4KRHymyIoo3TnwEHq8iLI1CGxk+YpCKZbp8QtLpTyzY9rbEJ254 MquaTDI4Ut4/cL5Nv3ife6LKYOWW8HVNFXNpMPr3tyhdUyZQ5CyeclJopJHAoHj2 1Pn5Pnh6OXRQ5m52+bycTdD7nEHyB6CDgwesm135bXHs2dShUgFZvHJjHp8ZF85/ l5iKDh2SDcEclw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddruddvhedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfhhohhmrghsucfoohhnjhgrlhhonhcuoehthhhomhgrshes mhhonhhjrghlohhnrdhnvghtqeenucfkphepjeejrddufeegrddvtdefrddukeegnecurf grrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtnecu vehluhhsthgvrhfuihiivgepvd X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id C66A780066; Mon, 12 Aug 2019 19:04:19 -0400 (EDT) From: Thomas Monjalon To: bruce.richardson@intel.com Cc: dev@dpdk.org Date: Tue, 13 Aug 2019 01:03:57 +0200 Message-Id: <20190812230358.988-6-thomas@monjalon.net> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190812230358.988-1-thomas@monjalon.net> References: <20190812230358.988-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 5/6] devtools: test compiler availability only once 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The compilation test is skipped if the compiler is not available. In the case of gcc/arm, it was tested both in the generic function "build" and in the cross-compilation section. By passing the compiler as argument of the generic function, the test with "command" is done only once. This small clean-up has the benefit of introducing the compiler parameter to be used later in another improvement. Signed-off-by: Thomas Monjalon Acked-by: Luca Boccassi --- devtools/test-meson-builds.sh | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index 9fe0a04c9..f2b0b347b 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -29,11 +29,13 @@ else exit 1 fi -build () # +build () # { builddir=$1 shift - if command -v $CC >/dev/null 2>&1 ; then + targetcc=$1 + shift + if command -v $CC $targetcc >/dev/null 2>&1 ; then if [ ! -f "$builddir/build.ninja" ] ; then options="--werror -Dexamples=all $*" echo "$MESON $options $srcdir $builddir" @@ -71,7 +73,7 @@ for c in gcc clang ; do command -v $c >/dev/null 2>&1 || continue for s in static shared ; do export CC="ccache $c" - build build-$c-$s --default-library=$s + build build-$c-$s $c --default-library=$s done done @@ -83,22 +85,19 @@ ok=$(cc -march=$default_machine -E - < /dev/null > /dev/null 2>&1 || echo false) if [ "$ok" = "false" ] ; then default_machine='corei7' fi -build build-x86-default -Dlibdir=lib -Dmachine=$default_machine $use_shared +build build-x86-default cc -Dlibdir=lib -Dmachine=$default_machine $use_shared -# enable cross compilation if gcc cross-compiler is found c=aarch64-linux-gnu-gcc -if command -v $c >/dev/null 2>&1 ; then - # compile the general v8a also for clang to increase coverage - export CC="clang" - build build-arm64-host-clang $use_shared \ - --cross-file $srcdir/config/arm/arm64_armv8_linux_gcc - - for f in $srcdir/config/arm/arm*gcc ; do - export CC="ccache gcc" - build build-$(basename $f | tr '_' '-' | cut -d'-' -f-2) \ - $use_shared --cross-file $f - done -fi +# generic armv8a with clang as host compiler +export CC="clang" +build build-arm64-host-clang $c $use_shared \ + --cross-file $srcdir/config/arm/arm64_armv8_linux_gcc +# all gcc/arm configurations +for f in $srcdir/config/arm/arm*gcc ; do + export CC="ccache gcc" + build build-$(basename $f | tr '_' '-' | cut -d'-' -f-2) $c \ + $use_shared --cross-file $f +done # Test installation of the x86-default target, to be used for checking # the sample apps build using the pkg-config file for cflags and libs From patchwork Mon Aug 12 23:03:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 57633 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4FD431BEAC; Tue, 13 Aug 2019 01:04:26 +0200 (CEST) Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by dpdk.org (Postfix) with ESMTP id B4AA31BE9F for ; Tue, 13 Aug 2019 01:04:23 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id C8118498; Mon, 12 Aug 2019 19:04:22 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 12 Aug 2019 19:04:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=jbni+SahdU UEXRXc0qqZELPj+NJhjMaw6J8wBE3pC8I=; b=SjojAn4R9R8p4/jO68trnHt/HX b6FFHem4amdITYziCBOBH8efVRw/iF4Qhlr/yH3CuCBHiVd+OH6+CK0pDjkdw89M 1HtvbeDddU8clQeh5LtQ90q/QCTvFJ/U63xuYaoXIpbFzaNU4YetRYvL/+5mvEh/ qJoE70kHNUsFLjrFc= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=jbni+SahdUUEXRXc0qqZELPj+NJhjMaw6J8wBE3pC8I=; b=Q/ifN6VI el+oHfvv54lbRHJ8gTTTs341nIhwVG0QndA+MtP7OH+ycbo2rj7SgYAyMuhG9F7t Jf/Fs+XdBcWERFOC+1xIn8foB24p7SKvEAYHIBBo2b9NhGpHhl1QFzH4TSQoTChG nqMkSUz2GiO6SC+eejdGrSY/08aYMx4/8ywkJQLBciN8QDAzoMKmI3/tTj/ZPI8c KBLDTxtAhr8r9eFpk9HOkKzJ37ryx+AMwjmcA/4snQa5vd+XXtYMp/MRkIr123Az N0C+IlgtwQlpoRm0Ut9zSm4WRjXOLJ3X13WuWvoP4MkDm+pqCccZNRlDLpSlXkqm +vKhUl7e48WmrQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddruddvhedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfhhohhmrghsucfoohhnjhgrlhhonhcuoehthhhomhgrshes mhhonhhjrghlohhnrdhnvghtqeenucfkphepjeejrddufeegrddvtdefrddukeegnecurf grrhgrmhepmhgrihhlfhhrohhmpehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtnecu vehluhhsthgvrhfuihiivgepge X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id A9A0C80059; Mon, 12 Aug 2019 19:04:21 -0400 (EDT) From: Thomas Monjalon To: bruce.richardson@intel.com Cc: dev@dpdk.org Date: Tue, 13 Aug 2019 01:03:58 +0200 Message-Id: <20190812230358.988-7-thomas@monjalon.net> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190812230358.988-1-thomas@monjalon.net> References: <20190812230358.988-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 6/6] devtools: load target-specific compilation environment 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" In order to re-use the same test environment as with test-build.sh, the configuration file is loaded at each build, after adjusting the variable DPDK_TARGET. This is especially useful to set the variable PKG_CONFIG_PATH, or define some meson options (without -D) in DPDK_MESON_OPTIONS. The DPDK_TARGET values can be aarch64-*, powerpc64-*, x86_64-*. The matching DPDK_TARGET values for test-build.sh are arm64-*, ppc_64-*, x86_64-*. The advised expressions to use in the common configuration file are: if echo $DPDK_TARGET | grep -q '^a.*64-' ; then elif echo $DPDK_TARGET | grep -q '^p.*pc.*64' ; then elif echo $DPDK_TARGET | grep -q '^x86_64' ; then fi Signed-off-by: Thomas Monjalon Acked-by: Luca Boccassi --- devtools/test-meson-builds.sh | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index f2b0b347b..a51a04d5a 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -29,15 +29,32 @@ else exit 1 fi +default_path=$PATH +default_pkgpath=$PKG_CONFIG_PATH + +reset_env () +{ + export PATH=$default_path + export PKG_CONFIG_PATH=$default_pkgpath + unset DPDK_MESON_OPTIONS +} + build () # { builddir=$1 shift targetcc=$1 shift + reset_env + DPDK_TARGET=$($targetcc -v 2>&1 | sed -n 's,^Target: ,,p') + . $srcdir/devtools/load-devel-config if command -v $CC $targetcc >/dev/null 2>&1 ; then if [ ! -f "$builddir/build.ninja" ] ; then - options="--werror -Dexamples=all $*" + options="--werror -Dexamples=all" + for option in $DPDK_MESON_OPTIONS ; do + options="$options -D$option" + done + options="$options $*" echo "$MESON $options $srcdir $builddir" $MESON $options $srcdir $builddir unset CC