From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9C0CBA04F9 for ; Thu, 9 Jan 2020 14:35:03 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8CD891C025; Thu, 9 Jan 2020 14:35:03 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) by dpdk.org (Postfix) with ESMTP id 6F6461DD8D for ; Thu, 9 Jan 2020 14:35:01 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578576900; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7Cjp7BV/9oX2V5TWyG9KzGDW/puOvv/tE8DMXknX2d0=; b=iZ5JQz/zeKiMOu6NW+30MMQ5enoF2QuMcgdKEM4F/lOke0fi0HPp8ahalzj8hW10V9RxBF r1Iwek7ye6klaXqSc0EYgvvDdrJZeR0nmQGJrjEIKrtRiDMKZ+x+SNRuEd7KWs7UxNcpOj Et6tfgFjEZsdo/8mXvgcPK3Xnn+obg0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-132-N0WHaT0qPQeWzkjFNBFcww-1; Thu, 09 Jan 2020 08:34:57 -0500 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 03996DBE5; Thu, 9 Jan 2020 13:34:56 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7F0D17C382; Thu, 9 Jan 2020 13:34:54 +0000 (UTC) From: Kevin Traynor To: stable@dpdk.org Cc: ktraynor@redhat.com, Thomas Monjalon , Bruce Richardson , Matan Azrad Date: Thu, 9 Jan 2020 13:34:33 +0000 Message-Id: <20200109133433.12494-8-ktraynor@redhat.com> In-Reply-To: <20200109133433.12494-1-ktraynor@redhat.com> References: <20200109133433.12494-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-MC-Unique: N0WHaT0qPQeWzkjFNBFcww-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] [18.11 7/7] net/mlx: allow build only on Linux X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" From: Thomas Monjalon [ upstream commit 3dee3f1b52127fac8943cbcb08e11328ef666046 ] Currently mlx4/mlx5 support only Linux. Fixes: 39a7ab1c14e2 ("net/mlx4: remove dependency on libmnl in meson") Signed-off-by: Thomas Monjalon Acked-by: Bruce Richardson Acked-by: Matan Azrad --- drivers/net/mlx4/meson.build | 11 +++++++++-- drivers/net/mlx5/meson.build | 10 +++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build index 4145f5db3..ebad30a04 100644 --- a/drivers/net/mlx4/meson.build +++ b/drivers/net/mlx4/meson.build @@ -3,4 +3,11 @@ # Copyright 2018 Mellanox Technologies, Ltd =20 +if host_machine.system() !=3D 'linux' +=09build =3D false +=09reason =3D 'only supported on Linux' +=09subdir_done() +endif +build =3D true + pmd_dlopen =3D get_option('enable_driver_mlx_glue') LIB_GLUE_BASE =3D 'librte_pmd_mlx4_glue.so' @@ -14,9 +21,9 @@ if pmd_dlopen =09] endif + libs =3D [ =09cc.find_library('mlx4', required:false), =09cc.find_library('ibverbs', required:false), ] -build =3D true foreach lib:libs =09if not lib.found() @@ -24,5 +31,5 @@ foreach lib:libs =09endif endforeach -# Compile PMD + if build =09allow_experimental_apis =3D true diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index 81965bddc..87b267a25 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -3,4 +3,11 @@ # Copyright 2018 Mellanox Technologies, Ltd =20 +if host_machine.system() !=3D 'linux' +=09build =3D false +=09reason =3D 'only supported on Linux' +=09subdir_done() +endif +build =3D true + pmd_dlopen =3D get_option('enable_driver_mlx_glue') LIB_GLUE_BASE =3D 'librte_pmd_mlx5_glue.so' @@ -14,4 +21,5 @@ if pmd_dlopen =09] endif + libs =3D [ =09cc.find_library('mnl', required:false), @@ -19,5 +27,4 @@ libs =3D [ =09cc.find_library('ibverbs', required:false), ] -build =3D true foreach lib:libs =09if not lib.found() @@ -25,4 +32,5 @@ foreach lib:libs =09endif endforeach + if build =09allow_experimental_apis =3D true --=20 2.21.1