[OE-core] [rocko][PATCH 1/2] Revert "waf.bbclass: explicitly pass bindir and libdir if supported"

[Joshua Watt]

On Tue, 2018-05-08 at 13:01 -0400, Denys Dmytriyenko wrote:
> I see this got merged/backported to rocko today.
> Now my builds are failing with this error during parsing of meta-
> openembedded:
> 
> 
> WARNING: /.../sources/meta-openembedded/meta-oe/recipes-
> multimedia/jack/jack_git.bb: Error during finalise of
> /.../sources/meta-openembedded/meta-oe/recipes-
> multimedia/jack/jack_git.bb
> WARNING: /.../sources/meta-openembedded/meta-oe/recipes-
> multimedia/jack/a2jmidid_8.bb: Exception during build_dependencies
> for waf_do_compile
> WARNING: /.../sources/meta-openembedded/meta-oe/recipes-
> multimedia/jack/a2jmidid_8.bb: Error during finalise of
> /.../sources/meta-openembedded/meta-oe/recipes-
> multimedia/jack/a2jmidid_8.bb
> ERROR: ExpansionError during parsing /.../sources/meta-
> openembedded/meta-oe/recipes-multimedia/jack/jack_git.bb
> Traceback (most recent call last):
> bb.data_smart.ExpansionError: Failure expanding variable
> waf_do_compile, expression was /.../build/tmp/work/armv7ahf-neon-
> linux-gnueabi/jack/1.9.10+gitAUTOINC+2d1d323505-r0/git/waf build
> ${@get_waf_parallel_make(d)} which triggered exception IndexError:
> pop from empty list

Hmm, interesting. I'm not sure it's related, it might be a bug in
get_waf_parallel_make(). Whats the value of ${PARALLEL_MAKE} in that
recipe?

> 
> 
> I remember we spent several week trying to fix it properly in master
> back 
> in February and coordinate fixes betweem meta-openembedded and oe-
> core. Is 
> anything else missing?
> 
> -- 
> Denys
> 
> 
> On Wed, Apr 25, 2018 at 02:07:13PM +0000, Martin Jansa wrote:
> > * this doesn't work correctly as discussed in:
> >   http://lists.openembedded.org/pipermail/openembedded-commits/2018
> > -January/218460.html
> > * some of the issues were fixed in master since then
> >   but not all, so revert it until it's completely resolved
> > 
> > This reverts commit eac21f981337bfaddb2d67161a1ff049158041ce.
> > 
> > Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> > ---
> >  meta/classes/waf.bbclass | 17 +----------------
> >  1 file changed, 1 insertion(+), 16 deletions(-)
> > 
> > diff --git a/meta/classes/waf.bbclass b/meta/classes/waf.bbclass
> > index acbda278a2..c4698e910a 100644
> > --- a/meta/classes/waf.bbclass
> > +++ b/meta/classes/waf.bbclass
> > @@ -25,23 +25,8 @@ def get_waf_parallel_make(d):
> >  
> >      return ""
> >  
> > -python waf_preconfigure() {
> > -    from distutils.version import StrictVersion
> > -    srcsubdir = d.getVar('S')
> > -    wafbin = os.path.join(srcsubdir, 'waf')
> > -    status, result = oe.utils.getstatusoutput(wafbin + " --
> > version")
> > -    if status != 0:
> > -        bb.warn("Unable to execute waf --version, exit code %d.
> > Assuming waf version without bindir/libdir support." % status)
> > -        return
> > -    version = result.split()[1]
> > -    if StrictVersion(version) >= StrictVersion("1.8.7"):
> > -        d.setVar("WAF_EXTRA_CONF", "--bindir=${bindir} --
> > libdir=${libdir}")
> > -}
> > -
> > -do_configure[prefuncs] += "waf_preconfigure"
> > -
> >  waf_do_configure() {
> > -	${S}/waf configure --prefix=${prefix} ${WAF_EXTRA_CONF}
> > ${EXTRA_OECONF}
> > +	${S}/waf configure --prefix=${prefix} ${EXTRA_OECONF}
> >  }
> >  
> >  waf_do_compile()  {
> > -- 
> > 2.17.0
> > 
> > -- 
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core at lists.openembedded.org
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core