]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commit
binconfig.bbclass: fix get_binconfig_mangle() rbt/6fixes
authorRobert Yang <liezhi.yang@windriver.com>
Mon, 13 Feb 2017 06:33:31 +0000 (22:33 -0800)
committerRobert Yang <liezhi.yang@windriver.com>
Mon, 20 Feb 2017 02:21:12 +0000 (02:21 +0000)
commit209574616b20c94157ff01659757efd6b732259c
treedc4c032f6dc5c4ec0a3f02b081cb79bda0b4e7eb
parent9c6af066d46ac01df8954b4a8c8ad8f7ee469e84
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.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
meta/classes/binconfig.bbclass