diff options
Diffstat (limited to 'meta/classes/binconfig.bbclass')
| -rw-r--r-- | meta/classes/binconfig.bbclass | 49 |
1 files changed, 28 insertions, 21 deletions
diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass index 60012c863d..39c3e2b17b 100644 --- a/meta/classes/binconfig.bbclass +++ b/meta/classes/binconfig.bbclass @@ -2,24 +2,29 @@ FILES_${PN}-dev += "${bindir}/*-config" # The namespaces can clash here hence the two step replace def get_binconfig_mangle(d): - s = "-e ''" - if not bb.data.inherits_class('native', d): - 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}:;'" - s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'" - s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'" - s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'" - s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'" - s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'" - s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'" - return s + s = "-e ''" + if not bb.data.inherits_class('native', d): + optional_quote = r"\(\"\?\)" + s += " -e 's:=%s${base_libdir}:=\\1OEBASELIBDIR:;'" % optional_quote + 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:-L${WORKDIR}:-LOELIBDIR:'" + s += " -e 's:-I${WORKDIR}:-IOEINCDIR:'" + s += " -e 's:OEBASELIBDIR:${STAGING_BASELIBDIR}:;'" + s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'" + s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'" + s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'" + s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'" + s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'" + if d.getVar("OE_BINCONFIG_EXTRA_MANGLE", False): + s += d.getVar("OE_BINCONFIG_EXTRA_MANGLE") + + return s BINCONFIG_GLOB ?= "*-config" @@ -28,7 +33,8 @@ PACKAGE_PREPROCESS_FUNCS += "binconfig_package_preprocess" binconfig_package_preprocess () { for config in `find ${PKGD} -name '${BINCONFIG_GLOB}'`; do sed -i \ - -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ + -e 's:${STAGING_BASELIBDIR}:${base_libdir}:g;' \ + -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ -e 's:${STAGING_INCDIR}:${includedir}:g;' \ -e 's:${STAGING_DATADIR}:${datadir}:' \ -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \ @@ -36,6 +42,7 @@ binconfig_package_preprocess () { done for lafile in `find ${PKGD} -name "*.la"` ; do sed -i \ + -e 's:${STAGING_BASELIBDIR}:${base_libdir}:g;' \ -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ -e 's:${STAGING_INCDIR}:${includedir}:g;' \ -e 's:${STAGING_DATADIR}:${datadir}:' \ @@ -47,10 +54,10 @@ binconfig_package_preprocess () { SYSROOT_PREPROCESS_FUNCS += "binconfig_sysroot_preprocess" binconfig_sysroot_preprocess () { - for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do + for config in `find ${S} -name '${BINCONFIG_GLOB}'` `find ${B} -name '${BINCONFIG_GLOB}'`; do configname=`basename $config` install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} - cat $config | sed ${@get_binconfig_mangle(d)} > ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname + sed ${@get_binconfig_mangle(d)} $config > ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname chmod u+x ${SYSROOT_DESTDIR}${bindir_crossscripts}/$configname done } |