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 9F014A0551; Mon, 17 Feb 2020 08:40:55 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2F8E61BF7D; Mon, 17 Feb 2020 08:40:55 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 315F21BF80 for ; Mon, 17 Feb 2020 08:40:54 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 01H7enh6027859 for ; Sun, 16 Feb 2020 23:40:53 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=pfpt0818; bh=X7E3OKGcQvflHeLWthJ+g4tp0+3rQsNn44H4h8avwRQ=; b=a5l7W7Cdbxtem+/UygHvZlBpMzT8M3ZVBlAY7O3LAC+E9IY0a6iDrgTQrmbMC+gPV0Qd 4jvTvhjKsuLVRX4MCz+kb2WFQtZwc6XqBXGlW90tV+j8eg9P9oftZUlZ8MCcHuXm7bpY WyfiXPG1U1NYbKkSQN+LY8+6M0RGoFCEL3jblRNx6HhEiznQwJnATeQqev/eVy2NY9qj OPJX4oNNThAXaAyASYcOfayI/eZouAwO5XWiv5RyGtYLPtD/8eIayf9KfdkrJ7yCgETx GWQ9SWYHsdf/lXaahr4Z5bKQglFzVbGj0AiNr0y9U2PUbLxTrKapfGCjciBfxtMm+TYE bA== Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0b-0016f401.pphosted.com with ESMTP id 2y6h1sx3n0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Sun, 16 Feb 2020 23:40:53 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 16 Feb 2020 23:40:49 -0800 Received: from SC-EXCH03.marvell.com (10.93.176.83) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Sun, 16 Feb 2020 23:40:48 -0800 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Sun, 16 Feb 2020 23:40:48 -0800 Received: from dc7-eodlnx05.marvell.com (dc7-eodlnx05.marvell.com [10.28.113.55]) by maili.marvell.com (Postfix) with ESMTP id AE53A3F703F; Sun, 16 Feb 2020 23:40:47 -0800 (PST) From: To: Harman Kalra CC: , Amit Gupta Date: Mon, 17 Feb 2020 13:10:29 +0530 Message-ID: <1581925230-14866-1-git-send-email-agupta3@marvell.com> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572 definitions=2020-02-17_04:2020-02-14, 2020-02-17 signatures=0 Subject: [dpdk-dev] [PATCH] net/octeontx: meson build fix if octeontx drivers are disabled 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" From: Amit Gupta Add a condition to check if octeontx drivers are disabled. octeontx drivers are built only if dependent drivers i.e. ethdev, mempool and common/octeontx are enabled. BugZilla ID # BUG 387 Change-Id: Idf9578fc04345e690ac48b4836faff2e25170331 Signed-off-by: Amit Gupta --- drivers/net/octeontx/base/meson.build | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build index a06a2c8..50e7972 100644 --- a/drivers/net/octeontx/base/meson.build +++ b/drivers/net/octeontx/base/meson.build @@ -9,17 +9,33 @@ sources = [ depends = ['ethdev', 'mempool_octeontx'] static_objs = [] -foreach d: depends - static_objs += [get_variable('static_rte_' + d)] + +disabled_drivers = get_option('disable_drivers').split(',') + +build = true +foreach disable_path: disabled_drivers + if (('net/octeontx' == disable_path) or + ('event/octeontx' == disable_path) or + ('common/octeontx' == disable_path) or + ('mempool/octeontx' == disable_path)) + build = false + endif endforeach c_args = cflags if allow_experimental_apis - c_args += '-DALLOW_EXPERIMENTAL_API' + c_args += '-DALLOW_EXPERIMENTAL_API' endif -base_lib = static_library('octeontx_base', sources, - c_args: c_args, - dependencies: static_objs, -) -base_objs = base_lib.extract_all_objects() +if build + foreach d: depends + static_objs += [get_variable('static_rte_' + d)] + endforeach + + base_lib = static_library('octeontx_base', sources, + c_args: c_args, + dependencies: static_objs, + ) + + base_objs = base_lib.extract_all_objects() +endif -- 1.8.3.1