From patchwork Fri Apr 16 17:04:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 91656 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9081FA0C41; Fri, 16 Apr 2021 19:07:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2BB05161AEA; Fri, 16 Apr 2021 19:05:47 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id E9325161A54 for ; Fri, 16 Apr 2021 19:05:24 +0200 (CEST) IronPort-SDR: DTFTe1jp1FCrcxiCYeYrcIMu4pwRKp3a+k3PNasn26T6himUP3Cg5f6wdbR4L8bW1pbU/pOFiK bbXuFK8vehMg== X-IronPort-AV: E=McAfee;i="6200,9189,9956"; a="280388289" X-IronPort-AV: E=Sophos;i="5.82,226,1613462400"; d="scan'208";a="280388289" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2021 10:05:24 -0700 IronPort-SDR: tLU4psKv/iB9KD+xSMavoKEcmXjMQLYM9vqGusq7bG2DJ+PL1OFzh7e7COkhfmimnNwfb6lNLG 5VD8AM3aaBaQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,226,1613462400"; d="scan'208";a="384375932" Received: from silpixa00399126.ir.intel.com ([10.237.223.116]) by orsmga006.jf.intel.com with ESMTP; 16 Apr 2021 10:05:23 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Fri, 16 Apr 2021 18:04:58 +0100 Message-Id: <20210416170458.50188-15-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210416170458.50188-1-bruce.richardson@intel.com> References: <20210401115009.1063844-1-bruce.richardson@intel.com> <20210416170458.50188-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 14/14] lib: allow disabling optional libraries X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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 the disable_libs option, to allow disabling the build of particular libraries. As part of this, maintain a list of what libraries can safely be disabled, without breaking the build - for now this list is solely those libraries which are not built on FreeBSD, kni, power and vhost. This list can be expanded by future patches. Signed-off-by: Bruce Richardson --- lib/meson.build | 24 +++++++++++++++++++++++- meson_options.txt | 2 ++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/lib/meson.build b/lib/meson.build index 3a9a6c3be..c9a20f65b 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -81,6 +81,23 @@ if is_windows ] # only supported libraries for windows endif +optional_libs = [ + 'kni', + 'power', + 'vhost', +] + +disabled_libs = [] +opt_disabled_libs = run_command(list_dir_globs, get_option('disable_libs')).stdout().split() +foreach l:opt_disabled_libs + if not optional_libs.contains(l) + warning('Cannot disable mandatory library "@0@"'.format(l)) + continue + endif + disabled_libs += l +endforeach + + default_cflags = machine_args default_cflags += ['-DALLOW_EXPERIMENTAL_API'] default_cflags += ['-DALLOW_INTERNAL_API'] @@ -114,7 +131,12 @@ foreach l:libraries deps += ['eal'] endif - subdir(l) + if disabled_libs.contains(l) + build = false + reason = 'explicitly disabled via build config' + else + subdir(l) + endif if name != l warning('Library name, "@0@", and directory name, "@1@", do not match'.format(name, l)) endif diff --git a/meson_options.txt b/meson_options.txt index 530fcddfa..9d73fd541 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -6,6 +6,8 @@ option('developer_mode', type: 'feature', description: 'turn on additional build checks relevant for DPDK developers') option('disable_drivers', type: 'string', value: '', description: 'Comma-separated list of drivers to explicitly disable.') +option('disable_libs', type: 'string', value: '', description: + 'Comma-separated list of libraries to explicitly disable. [NOTE: not all libs can be disabled]') 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, description: