[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4708/8267] binconfig.bbclass: fix get_binconfig_mangle()

[Emmanuele Bassi <ebassi src gnome org>]

commit 3711607d918c800e249c441c85227111362a796f
Author: Robert Yang <liezhi yang windriver com>
Date:   Sun Feb 12 22:33:31 2017 -0800

    binconfig.bbclass: fix get_binconfig_mangle()
    
    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.
    
    (From OE-Core rev: 42e4e36de37b8e06a2ff56172d04d3ffeccfbfae)
    
    Signed-off-by: Robert Yang <liezhi yang windriver com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/binconfig.bbclass |    4 ++--
 1 files 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:'"
         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")