diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-12-27 22:31:14 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-12-27 22:31:14 +0000 |
| commit | 82c526e5d8f578bb0b3826ce5f71248a7338ed17 (patch) | |
| tree | 75e0a099e11e3caa3827eae34877321ff20bb09c /classes | |
| parent | 6f8e7f7a711a66da93fcec32c65fd669bf1d7aa8 (diff) | |
| parent | 2118494c862cc7442fda5249394b924575a6f7ca (diff) | |
merge of 'bed1f45d5c2e76fbd336580d09caef10c613f256'
and 'fbb56d5a76093891efdc7abc682059fd0436d4be'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/autotools.bbclass | 2 | ||||
| -rw-r--r-- | classes/binconfig.bbclass | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 8e4fba9400..991e472b14 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -174,6 +174,8 @@ autotools_stage_all() { fi if [ -d ${STAGE_TEMP}/${libdir} ] then + find ${STAGE_TEMP}/${libdir} -name '*.la' -exec sed -i s,installed=yes,installed=no, {} \; + for i in ${STAGE_TEMP}/${libdir}/*.la do if [ ! -f "$i" ]; then diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index 4e425a76d6..5ce9ff6f0d 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -20,6 +20,8 @@ def get_binconfig_mangle(d): s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'" s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'" s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'" + if bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d): + s += bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d) return s BINCONFIG_GLOB ?= "*-config" |