diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2006-09-14 02:47:34 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2006-09-14 02:47:34 +0000 |
| commit | 2147439068bd10a83e3b3705f5beb566391310b1 (patch) | |
| tree | 1f8f096159b8bdfb0656365efbe8c432d903ccb1 /classes | |
| parent | d9c71b977c6f12d1e9c0eb4f88e072efafba7657 (diff) | |
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.
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/binconfig.bbclass | 11 |
1 files 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}:;'" |