| Submitter | Phil Blundell |
|---|---|
| Date | May 31, 2011, 4:06 p.m. |
| Message ID | <1306857982.2529.13.camel@phil-desktop> |
| Download | mbox | patch |
| Permalink | /patch/5113/ |
| State | New, archived |
| Headers | show |
Comments
On 05/31/2011 09:06 AM, Phil Blundell wrote: > 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> > --- > 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 8e22d2d..3deb541 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}:;'" Merged into OE-Core Thanks Sau!
Patch
diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass index 8e22d2d..3deb541 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}:;'"
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> --- meta/classes/binconfig.bbclass | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)