From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id ABFA05A6E for ; Fri, 31 Aug 2018 15:35:25 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Aug 2018 06:35:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,311,1531810800"; d="scan'208";a="253474461" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.223]) by orsmga005.jf.intel.com with ESMTP; 31 Aug 2018 06:35:19 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: Ilya Maximets , Bruce Richardson Date: Fri, 31 Aug 2018 14:35:10 +0100 Message-Id: <20180831133510.3121-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH] net/*/base: allow use of experimental APIs in base code 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: , X-List-Received-Date: Fri, 31 Aug 2018 13:35:26 -0000 The driver setting of "allow_experimental_apis" was not being used when building the base code. To allow this we can manually put in a check in the base code files for the setting and set the appropriate cflag if it's needed. Signed-off-by: Bruce Richardson --- drivers/net/e1000/base/meson.build | 3 +++ drivers/net/fm10k/base/meson.build | 3 +++ drivers/net/i40e/base/meson.build | 3 +++ drivers/net/ixgbe/base/meson.build | 3 +++ drivers/net/octeontx/base/meson.build | 6 +++++- drivers/net/sfc/base/meson.build | 3 +++ drivers/net/thunderx/base/meson.build | 6 +++++- 7 files changed, 25 insertions(+), 2 deletions(-) diff --git a/drivers/net/e1000/base/meson.build b/drivers/net/e1000/base/meson.build index 5e1716def..f26f24298 100644 --- a/drivers/net/e1000/base/meson.build +++ b/drivers/net/e1000/base/meson.build @@ -25,6 +25,9 @@ error_cflags = ['-Wno-uninitialized', '-Wno-unused-parameter', '-Wno-unused-variable', '-Wno-misleading-indentation', '-Wno-implicit-fallthrough'] c_args = cflags +if allow_experimental_apis + c_args += '-DALLOW_EXPERIMENTAL_API' +endif foreach flag: error_cflags if cc.has_argument(flag) c_args += flag diff --git a/drivers/net/fm10k/base/meson.build b/drivers/net/fm10k/base/meson.build index a8fc5fa8b..5525cdc82 100644 --- a/drivers/net/fm10k/base/meson.build +++ b/drivers/net/fm10k/base/meson.build @@ -15,6 +15,9 @@ error_cflags = ['-Wno-unused-parameter', '-Wno-unused-value', '-Wno-unused-variable', '-Wno-missing-field-initializers' ] c_args = cflags +if allow_experimental_apis + c_args += '-DALLOW_EXPERIMENTAL_API' +endif foreach flag: error_cflags if cc.has_argument(flag) c_args += flag diff --git a/drivers/net/i40e/base/meson.build b/drivers/net/i40e/base/meson.build index e6163eaa6..d4c8f872d 100644 --- a/drivers/net/i40e/base/meson.build +++ b/drivers/net/i40e/base/meson.build @@ -16,6 +16,9 @@ error_cflags = ['-Wno-sign-compare', '-Wno-unused-value', '-Wno-strict-aliasing', '-Wno-unused-but-set-variable' ] c_args = cflags +if allow_experimental_apis + c_args += '-DALLOW_EXPERIMENTAL_API' +endif foreach flag: error_cflags if cc.has_argument(flag) c_args += flag diff --git a/drivers/net/ixgbe/base/meson.build b/drivers/net/ixgbe/base/meson.build index 3147e1101..21ac64bf5 100644 --- a/drivers/net/ixgbe/base/meson.build +++ b/drivers/net/ixgbe/base/meson.build @@ -20,6 +20,9 @@ sources = [ error_cflags = ['-Wno-unused-value', '-Wno-unused-but-set-variable'] c_args = cflags +if allow_experimental_apis + c_args += '-DALLOW_EXPERIMENTAL_API' +endif foreach flag: error_cflags if cc.has_argument(flag) c_args += flag diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build index 09f657abb..a06a2c89c 100644 --- a/drivers/net/octeontx/base/meson.build +++ b/drivers/net/octeontx/base/meson.build @@ -13,8 +13,12 @@ foreach d: depends static_objs += [get_variable('static_rte_' + d)] endforeach +c_args = cflags +if allow_experimental_apis + c_args += '-DALLOW_EXPERIMENTAL_API' +endif base_lib = static_library('octeontx_base', sources, - c_args: cflags, + c_args: c_args, dependencies: static_objs, ) diff --git a/drivers/net/sfc/base/meson.build b/drivers/net/sfc/base/meson.build index da2bf44d8..ab66f32f9 100644 --- a/drivers/net/sfc/base/meson.build +++ b/drivers/net/sfc/base/meson.build @@ -58,6 +58,9 @@ extra_flags = [ ] c_args = cflags +if allow_experimental_apis + c_args += '-DALLOW_EXPERIMENTAL_API' +endif foreach flag: extra_flags if cc.has_argument(flag) c_args += flag diff --git a/drivers/net/thunderx/base/meson.build b/drivers/net/thunderx/base/meson.build index c9d5a8f4e..bf4e8608a 100644 --- a/drivers/net/thunderx/base/meson.build +++ b/drivers/net/thunderx/base/meson.build @@ -7,8 +7,12 @@ sources = [ 'nicvf_bsvf.c' ] +c_args = cflags +if allow_experimental_apis + c_args += '-DALLOW_EXPERIMENTAL_API' +endif base_lib = static_library('nicvf_base', sources, - c_args: cflags, + c_args: c_args, dependencies: static_rte_ethdev ) -- 2.17.1