[OE-core] [PATCH 6/6] binconfig.bbclass: fix get_binconfig_mangle()

[Robert Yang]

On 02/16/2017 06:56 PM, Martin Jansa wrote:
> On Tue, Feb 14, 2017 at 10:25:11PM -0800, Robert Yang wrote:
>> The command was:
>> s += " -e 's:-L${libdir}:-LOELIBDIR:;'"
>> s += " -e 's:-I${includedir}:-IOEINCDIR:;'"
>> s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
>> s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
>> s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
>> s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
>>
>> The STAGING_LIBDIR and STAGING_INCDIR now contains WORKDIR, so the
>> result would be incorrect like:
>> TCL_INCLUDE_SPEC='-IFIXMESTAGINGDIRTARGET/usr/include/recipe-sysroot/usr/include/tcl8.6'
>>
>> Note, the "/usr/include/recipe-sysroot" is not needed. Move the last two
>> sed commands ahead will fix the problem.
>>
>> Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
>> ---
>>  meta/classes/binconfig.bbclass | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
>> index 5372294..1be5fc4 100644
>> --- a/meta/classes/binconfig.bbclass
>> +++ b/meta/classes/binconfig.bbclass
>> @@ -13,14 +13,14 @@ def get_binconfig_mangle(d):
>>          s += " -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:'" % optional_quote
>>          s += " -e 's:-L${libdir}:-LOELIBDIR:;'"
>>          s += " -e 's:-I${includedir}:-IOEINCDIR:;'"
>> +        s += " -e 's:-L${WORKDIR}:-LOELIBDIR:'"
>> +        s += " -e 's:-I${WORKDIR}:-I-IOEINCDIR:'"
>
> Is the "-I-I" intentional?

Sorry, it's a typo, updated in the repo:

diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
index 5372294..39c3e2b 100644
--- a/meta/classes/binconfig.bbclass
+++ b/meta/classes/binconfig.bbclass
@@ -13,14 +13,14 @@ def get_binconfig_mangle(d):
          s += " -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:'" % optional_quote
          s += " -e 's:-L${libdir}:-LOELIBDIR:;'"
          s += " -e 's:-I${includedir}:-IOEINCDIR:;'"
+        s += " -e 's:-L${WORKDIR}:-LOELIBDIR:'"
+        s += " -e 's:-I${WORKDIR}:-IOEINCDIR:'"
          s += " -e 's:OEBASELIBDIR:${STAGING_BASELIBDIR}:;'"
          s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
          s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
          s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
          s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'"
          s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'"
-        s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
-        s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
          if d.getVar("OE_BINCONFIG_EXTRA_MANGLE", False):
              s += d.getVar("OE_BINCONFIG_EXTRA_MANGLE")

// Robert

>
>>          s += " -e 's:OEBASELIBDIR:${STAGING_BASELIBDIR}:;'"
>>          s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
>>          s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
>>          s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
>>          s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'"
>>          s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'"
>> -        s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
>> -        s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
>>          if d.getVar("OE_BINCONFIG_EXTRA_MANGLE", False):
>>              s += d.getVar("OE_BINCONFIG_EXTRA_MANGLE")
>>
>> --
>> 2.10.2
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core at lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>