diff options
| author | Phil Blundell <pb@pbcl.net> | 2011-05-31 17:06:22 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-01 18:32:29 +0100 |
| commit | 854b15bf631452150d1979dfd8286b306f108688 (patch) | |
| tree | 73a24eaf17bb0b6a7753a110c963241ab165b3be /meta/classes/binconfig.bbclass | |
| parent | fb556532d4320518b96808d773d9e42719293be4 (diff) | |
| download | openembedded-core-854b15bf631452150d1979dfd8286b306f108688.tar.gz openembedded-core-854b15bf631452150d1979dfd8286b306f108688.tar.bz2 openembedded-core-854b15bf631452150d1979dfd8286b306f108688.zip | |
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.
Signed-off-by: Phil Blundell <philb@gnu.org>
Diffstat (limited to 'meta/classes/binconfig.bbclass')
| -rw-r--r-- | 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 8e22d2d292..3deb5415e3 100644 --- a/meta/classes/binconfig.bbclass +++ b/meta/classes/binconfig.bbclass @@ -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}:;'" |