From 2147439068bd10a83e3b3705f5beb566391310b1 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Thu, 14 Sep 2006 02:47:34 +0000 Subject: binconfig.bbclass: Fix path rewriting for staged packages. * This bbclass does path rewriting within *-config scripts for packages being staged. However, it used to expect variable assignments in form foo=bar, whereas some packages (e.g. libpng) have foo="bar". Fixed to understand both formats. * Note: I consider this fix a workaround, as it uses overquoted regexps passed via command line. Instead, whole rewriting should be reimplemented in Python. --- classes/binconfig.bbclass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index bf15ebcdf9..34021845ee 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -5,11 +5,12 @@ def get_binconfig_mangle(d): import bb.data s = "-e ''" if not bb.data.inherits_class('native', d): - s += " -e 's:=${libdir}:=OELIBDIR:;'" - s += " -e 's:=${includedir}:=OEINCDIR:;'" - s += " -e 's:=${datadir}:=OEDATADIR:'" - s += " -e 's:=${prefix}:=OEPREFIX:'" - s += " -e 's:=${exec_prefix}:=OEEXECPREFIX:'" + optional_quote = r"\(\"\?\)" + 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:-L${libdir}:-LOELIBDIR:;'" s += " -e 's:-I${includedir}:-IOEINCDIR:;'" s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" -- cgit 1.2.3-korg