binconfig: improve handling of empty prefixes
This is a backport of 952e5e2b7a5c1deefc939594d40b81a71fb16a54 from oe master. Without this the script mangling goes very wrong if ${prefix}="". There isn't really any way to fix this in the completely general case, but this patch does work with the two cases I tested (freetype and gpg-error) which were unusable previously. (From OE-Core rev: 854b15bf631452150d1979dfd8286b306f108688) Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
e8ded5e863
commit
817a98d74a
|
@ -6,8 +6,8 @@ def get_binconfig_mangle(d):
|
|||
s += " -e 's:=%s${libdir}:=\\1OELIBDIR:;'" % optional_quote
|
||||
s += " -e 's:=%s${includedir}:=\\1OEINCDIR:;'" % optional_quote
|
||||
s += " -e 's:=%s${datadir}:=\\1OEDATADIR:'" % optional_quote
|
||||
s += " -e 's:=%s${prefix}:=\\1OEPREFIX:'" % optional_quote
|
||||
s += " -e 's:=%s${exec_prefix}:=\\1OEEXECPREFIX:'" % optional_quote
|
||||
s += " -e 's:=%s${prefix}/:=\\1OEPREFIX/:'" % optional_quote
|
||||
s += " -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:'" % optional_quote
|
||||
s += " -e 's:-L${libdir}:-LOELIBDIR:;'"
|
||||
s += " -e 's:-I${includedir}:-IOEINCDIR:;'"
|
||||
s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
|
||||
|
|
Loading…
Reference in New Issue