On Thu, Apr 19, 2018 at 01:05:11PM +0100, Bruce Richardson wrote: > On Thu, Apr 19, 2018 at 11:45:38AM +0200, Tomasz Duszynski wrote: > > Since not cluttering environment and keeping all relevant > > settings local to the cross build is reasonable get > > MUSDK library installation path from a meson option. > > > > Signed-off-by: Tomasz Duszynski <t...@semihalf.com> > > --- > > drivers/net/mvpp2/meson.build | 2 +- > > meson_options.txt | 2 ++ > > 2 files changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/net/mvpp2/meson.build b/drivers/net/mvpp2/meson.build > > index 6ea13ee..e139889 100644 > > --- a/drivers/net/mvpp2/meson.build > > +++ b/drivers/net/mvpp2/meson.build > > @@ -3,7 +3,7 @@ > > # Copyright(c) 2018 Semihalf. > > # All rights reserved. > > > > -path = run_command('printenv', 'LIBMUSDK_PATH').stdout().strip() > > +path = get_option('lib_musdk_dir') > > lib_dir = path + '/lib' > > inc_dir = path + '/include' > > > > diff --git a/meson_options.txt b/meson_options.txt > > index 1a674aa..c843278 100644 > > --- a/meson_options.txt > > +++ b/meson_options.txt > > @@ -8,6 +8,8 @@ option('include_subdir_arch', type: 'string', value: '', > > description: 'subdirectory where to install arch-dependent headers') > > option('kernel_dir', type: 'string', value: '', > > description: 'path to the kernel for building kernel modules') > > +option('lib_musdk_dir', type: 'string', value: '', > > + description: 'path to the MUSDK library installation directory') > > option('machine', type: 'string', value: 'native', > > description: 'set the target machine type') > > option('max_lcores', type: 'string', value: '128', > > -- > > 2.7.4 > > Looks good. Are you ok with me just squashing this into the original commit? > > /Bruce > > Acked-by: Bruce Richardson <bruce.richard...@intel.com>
Sure, thanks. -- - Tomasz DuszyĆski