From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 273F4C433B4 for ; Thu, 1 Apr 2021 11:52:26 +0000 (UTC) Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by mail.kernel.org (Postfix) with ESMTP id 999F3610CE for ; Thu, 1 Apr 2021 11:52:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 999F3610CE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dev-bounces@dpdk.org Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A93A2141132; Thu, 1 Apr 2021 13:50:57 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mails.dpdk.org (Postfix) with ESMTP id D7850141105 for ; Thu, 1 Apr 2021 13:50:54 +0200 (CEST) IronPort-SDR: REDfcrqKYoRALjUywz0JYUJpwlWMeI58/RD05rVag5kyikW2ao5LjjTL6d/QrmQCHcEJHGi9cq 1AtEWQ17/SIQ== X-IronPort-AV: E=McAfee;i="6000,8403,9940"; a="179760834" X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="179760834" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2021 04:50:54 -0700 IronPort-SDR: trzTcaBCNNU/QcrNswjbVikNC6qiDHAYZ/MpiAB+q0B9DssncPxy6UqDvZSFS3gmfTzAjmWn2C KSRK79SOQXcA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,296,1610438400"; d="scan'208";a="446062816" Received: from silpixa00399126.ir.intel.com ([10.237.223.116]) by FMSMGA003.fm.intel.com with ESMTP; 01 Apr 2021 04:50:53 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: thomas@monjalon.net, david.marchand@redhat.com, bluca@debian.org, Bruce Richardson Date: Thu, 1 Apr 2021 12:50:09 +0100 Message-Id: <20210401115009.1063844-15-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210401115009.1063844-1-bruce.richardson@intel.com> References: <20210401115009.1063844-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [RFC 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 dc236c06de..aedc345c7f 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -49,6 +49,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'] @@ -81,7 +98,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 f22db9fb7d..4a9d41127d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,6 +4,8 @@ option('check_includes', type: 'boolean', value: false, description: 'build "chkincs" to verify each header file can compile alone') 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, -- 2.27.0