summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-02-12 22:33:31 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-23 12:49:49 -0800
commit3711607d918c800e249c441c85227111362a796f (patch)
treec1ca4ffaf7998ca0fe222569e418cd3d2868724e /meta/classes
parentce79111e735529546e8a20e4315e3566a556a936 (diff)
downloadpoky-3711607d918c800e249c441c85227111362a796f.tar.gz
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>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/binconfig.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass
index 5372294142..1be5fc4d9c 100644
--- a/meta/classes/binconfig.bbclass
+++ b/meta/classes/binconfig.bbclass
@@ -13,14 +13,14 @@ def get_binconfig_mangle(d):
13 s += " -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:'" % optional_quote 13 s += " -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:'" % optional_quote
14 s += " -e 's:-L${libdir}:-LOELIBDIR:;'" 14 s += " -e 's:-L${libdir}:-LOELIBDIR:;'"
15 s += " -e 's:-I${includedir}:-IOEINCDIR:;'" 15 s += " -e 's:-I${includedir}:-IOEINCDIR:;'"
16 s += " -e 's:-L${WORKDIR}:-LOELIBDIR:'"
17 s += " -e 's:-I${WORKDIR}:-I-IOEINCDIR:'"
16 s += " -e 's:OEBASELIBDIR:${STAGING_BASELIBDIR}:;'" 18 s += " -e 's:OEBASELIBDIR:${STAGING_BASELIBDIR}:;'"
17 s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" 19 s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
18 s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'" 20 s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
19 s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'" 21 s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
20 s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'" 22 s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'"
21 s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'" 23 s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'"
22 s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
23 s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
24 if d.getVar("OE_BINCONFIG_EXTRA_MANGLE", False): 24 if d.getVar("OE_BINCONFIG_EXTRA_MANGLE", False):
25 s += d.getVar("OE_BINCONFIG_EXTRA_MANGLE") 25 s += d.getVar("OE_BINCONFIG_EXTRA_MANGLE")
26 26