On Mon, Sep 03, 2018 at 05:52:58PM +0300, Ilya Maximets wrote: > On 03.09.2018 17:41, Ilya Maximets wrote: > > On 31.08.2018 16:35, Bruce Richardson wrote: > >> 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 <bruce.richard...@intel.com> > > > > Tested-by: Ilya Maximets <i.maxim...@samsung.com> > > > >> --- > >> 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' > > Actually, "-Wno-unused-but-set-variable" part is missing on master, so > the patch could not be applied cleanly. I tested it after removing this > flag from the patch to make it applicable. > Ok, could be. I was testing applying a few other meson patches - such as those from Luca - earlier. I think this should apply ok on top of those other sets.
/Bruce
