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:34:36 +0100 |
| commit | 817a98d74aef5726799af6ba78814dd633ebd699 (patch) | |
| tree | f1466879a4dfa0fb1e58d9ad16720e5f56fd1b75 | |
| parent | e8ded5e863b8094e1ab6d6a19fd1ac39add50a4d (diff) | |
| download | poky-817a98d74aef5726799af6ba78814dd633ebd699.tar.gz | |
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>
| -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): | |||
| 6 | s += " -e 's:=%s${libdir}:=\\1OELIBDIR:;'" % optional_quote | 6 | s += " -e 's:=%s${libdir}:=\\1OELIBDIR:;'" % optional_quote |
| 7 | s += " -e 's:=%s${includedir}:=\\1OEINCDIR:;'" % optional_quote | 7 | s += " -e 's:=%s${includedir}:=\\1OEINCDIR:;'" % optional_quote |
| 8 | s += " -e 's:=%s${datadir}:=\\1OEDATADIR:'" % optional_quote | 8 | s += " -e 's:=%s${datadir}:=\\1OEDATADIR:'" % optional_quote |
| 9 | s += " -e 's:=%s${prefix}:=\\1OEPREFIX:'" % optional_quote | 9 | s += " -e 's:=%s${prefix}/:=\\1OEPREFIX/:'" % optional_quote |
| 10 | s += " -e 's:=%s${exec_prefix}:=\\1OEEXECPREFIX:'" % optional_quote | 10 | s += " -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:'" % optional_quote |
| 11 | s += " -e 's:-L${libdir}:-LOELIBDIR:;'" | 11 | s += " -e 's:-L${libdir}:-LOELIBDIR:;'" |
| 12 | s += " -e 's:-I${includedir}:-IOEINCDIR:;'" | 12 | s += " -e 's:-I${includedir}:-IOEINCDIR:;'" |
| 13 | s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" | 13 | s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" |