* [PATCH] binconfig: improve handling of empty prefixes
@ 2011-05-31 16:06 Phil Blundell
2011-06-03 0:06 ` Saul Wold
0 siblings, 1 reply; 2+ messages in thread
From: Phil Blundell @ 2011-05-31 16:06 UTC (permalink / raw)
To: openembedded-core
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}:;'"
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] binconfig: improve handling of empty prefixes
2011-05-31 16:06 [PATCH] binconfig: improve handling of empty prefixes Phil Blundell
@ 2011-06-03 0:06 ` Saul Wold
0 siblings, 0 replies; 2+ messages in thread
From: Saul Wold @ 2011-06-03 0:06 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
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!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-06-03 0:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-31 16:06 [PATCH] binconfig: improve handling of empty prefixes Phil Blundell
2011-06-03 0:06 ` Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox