The issue was that disabling a module did not disable any checks for the
module, which would cause the build to fail if dependencies were not
installed. I've made further improvements.

On Sat, Nov 4, 2017 at 6:52 AM <marcel-hollerb...@t-online.de> wrote:

> How does that fix module disabling ?
>
> The modules themself define disable = true to be NOT build, this patch
> now ends up only building a module if it disable = true...
>
> Greetings,
>    Marcel Hollerbach
>
>
> On Fri, Nov 03, 2017 at 12:18:52PM -0700, Mike Blumenkrantz wrote:
> > derekf pushed a commit to branch master.
> >
> >
> http://git.enlightenment.org/core/enlightenment.git/commit/?id=763c67a68d5a2249024d4b29af1922aa8a634988
> >
> > commit 763c67a68d5a2249024d4b29af1922aa8a634988
> > Author: Mike Blumenkrantz <zm...@osg.samsung.com>
> > Date:   Fri Nov 3 14:35:43 2017 -0400
> >
> >     check meson module option state before executing subdir
> >
> >     fix module disabling
> > ---
> >  src/modules/meson.build | 10 ++++++----
> >  1 file changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/src/modules/meson.build b/src/modules/meson.build
> > index 337ce9c4c..01e335fc7 100644
> > --- a/src/modules/meson.build
> > +++ b/src/modules/meson.build
> > @@ -79,7 +79,6 @@ mods = [
> >  foreach m: mods
> >    desktop_only = false
> >    no_icon      = false
> > -  disable      = false
> >    cargs        = ''
> >    data         = []
> >    deps         = []
> > @@ -87,11 +86,14 @@ foreach m: mods
> >    _dir         = join_paths(dir_module_e, m)
> >    _dir_bin     = join_paths(_dir, module_arch)
> >
> > -  subdir(m)
> > -
> >    opt = '-'.join(m.split('_'))
> > +  disable = get_option(opt)
> > +
> > +  if disable == true
> > +    subdir(m)
> > +  endif
> >
> > -  if get_option(opt) == true and disable == false
> > +  if disable == true
> >
> >      _inc2 = []
> >      foreach i: inc
> >
> > --
> >
> >
>
>
> ------------------------------------------------------------------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> _______________________________________________
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Reply via email to