diff options
| author | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-27 21:24:12 +0000 |
|---|---|---|
| committer | Paul Sokolovsky <pmiscml@gmail.com> | 2007-07-27 21:24:12 +0000 |
| commit | 3ec8407fcdcac93b491616a6f8e20c27ac789fad (patch) | |
| tree | 05ed46a1da4281d0ad6422e1d04289050383bd23 /classes | |
| parent | 8caffa254ca4072d1530f4c3273e4ba87700252f (diff) | |
| parent | a0a17d54ae3dfdf9acf1a339650701fe83efb500 (diff) | |
merge of '65fcc53beb3d65343762ba2dce11a497216af44c'
and 'f81643eda3b84834595762e576e7135f0101ce23'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/autotools.bbclass | 7 | ||||
| -rw-r--r-- | classes/magicbox-image.bbclass | 2 | ||||
| -rw-r--r-- | classes/pkgconfig.bbclass | 9 | ||||
| -rw-r--r-- | classes/sanity.bbclass | 2 |
4 files changed, 18 insertions, 2 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 3c555751da..fccf2b6d80 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -139,6 +139,13 @@ autotools_do_configure() { autotools_do_install() { oe_runmake 'DESTDIR=${D}' install + + for i in `find ${D} -name "*.la"` ; do \ + sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i + sed -i -e s:${D}::g $i + sed -i -e 's:-I${WORKDIR}\S*: :g' $i + sed -i -e 's:-L${WORKDIR}\S*: :g' $i + done } STAGE_TEMP="${WORKDIR}/temp-staging" diff --git a/classes/magicbox-image.bbclass b/classes/magicbox-image.bbclass index 05de28b76b..c75e69cac2 100644 --- a/classes/magicbox-image.bbclass +++ b/classes/magicbox-image.bbclass @@ -1,6 +1,6 @@ magicbox_gen_images() { # find latest kernel - KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -1` + KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -n 1` if [ -z "$KERNEL" ]; then oefatal "No kernel found in ${DEPLOY_DIR_IMAGE}. Exiting !" exit 1 diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass index f2054b0b07..cd6e04731e 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -17,8 +17,17 @@ def get_pkgconfig_mangle(d): s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'" s += " -e 's:OEPREFIX:${STAGING_LIBDIR}/..:'" s += " -e 's:OEEXECPREFIX:${STAGING_LIBDIR}/..:'" + s += " -e 's:-L${WORKDIR}\S*: :g'" + s += " -e 's:-I${WORKDIR}\S*: :g'" + return s +do_install_append () { + for pc in `find ${D} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do + sed -i ${@get_pkgconfig_mangle(d)} ${pc} + done +} + do_stage_append () { for pc in `find ${S} -name '*.pc' -type f | grep -v -- '-uninstalled.pc$'`; do pcname=`basename $pc` diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index d2fd4b0b04..a0da0667dd 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -89,7 +89,7 @@ def check_sanity(e): if not check_app_exists('${BUILD_PREFIX}g++', e.data): missing = missing + "C++ Compiler (${BUILD_PREFIX}g++)," - required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk md5sum bison" + required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk md5sum bison" for util in required_utilities.split(): if not check_app_exists( util, e.data ): |