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

[Vincent Prince]

Hi Stefan,

If I remember correctly, you submitted this feature?

Best Regards,
Vincent

2018-03-14 16:28 GMT+01:00 Martin Jansa <martin.jansa at gmail.com>:

> ping, this was in rocko-next for a while and then it disappeared.
>
> On Sun, Mar 11, 2018 at 1:43 AM, Martin Jansa <martin.jansa at gmail.com>
> 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.15.1
>>
>>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20180314/7a4ec63a/attachment-0002.html>