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 B7162A0613 for ; Wed, 25 Sep 2019 16:56:04 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 648771BF57; Wed, 25 Sep 2019 16:55:47 +0200 (CEST) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id 787A51BF52; Wed, 25 Sep 2019 16:55:43 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Sep 2019 07:55:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,548,1559545200"; d="scan'208";a="390235769" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by fmsmga006.fm.intel.com with ESMTP; 25 Sep 2019 07:55:41 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: bluca@debian.org, thomas@monjalon.net, mb@smartsharesystems.com, techboard@dpdk.org, Bruce Richardson Date: Wed, 25 Sep 2019 15:55:31 +0100 Message-Id: <20190925145531.52705-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190925145531.52705-1-bruce.richardson@intel.com> References: <20190925145531.52705-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 3/3] build: support disabling drivers with meson 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" Add support for a new build option to turn off certain drivers. Any other drivers which depend on the one being disabled will also be disabled with a suitable debug message. Signed-off-by: Bruce Richardson --- drivers/meson.build | 16 ++++++++++++---- meson_options.txt | 2 ++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/meson.build b/drivers/meson.build index ee5db4157..e7a696d52 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -16,6 +16,8 @@ dpdk_driver_classes = ['common', 'baseband', # depends on common and bus. 'raw'] # depends on common, bus, mempool, net and event. +disabled_drivers = get_option('disable_drivers').split(',') + default_cflags = machine_args if cc.has_argument('-Wno-format-truncation') default_cflags += '-Wno-format-truncation' @@ -59,17 +61,23 @@ foreach class:dpdk_driver_classes # pull in driver directory which should assign to each of the above subdir(drv_path) - if build + if drv_path in disabled_drivers + build = false + reason = 'Explicitly disabled via build config' + elif build # get dependency objs from strings shared_deps = ext_deps static_deps = ext_deps foreach d:deps if not is_variable('shared_rte_' + d) - error('Missing internal dependency "@0@" for @1@ [@2@]' + build = false + reason = 'Missing internal dependency, "@0@"'.format(d) + message('Disabling @1@ [@2@]: missing internal dependency "@0@"' .format(d, name, 'drivers/' + drv_path)) + else + shared_deps += [get_variable('shared_rte_' + d)] + static_deps += [get_variable('static_rte_' + d)] endif - shared_deps += [get_variable('shared_rte_' + d)] - static_deps += [get_variable('static_rte_' + d)] endforeach endif diff --git a/meson_options.txt b/meson_options.txt index 448f3e63d..89650b0e9 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -2,6 +2,8 @@ option('allow_invalid_socket_id', type: 'boolean', value: false, description: 'allow out-of-range NUMA socket id\'s for platforms that don\'t report the value correctly') +option('disable_drivers', type: 'string', value: '', + description: 'Comma-separated list of drivers to explicitly disable.') option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-', description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.') option('enable_docs', type: 'boolean', value: false, -- 2.21.0