gnutls: bump PR. don't use _prepend for do_configure.

[familiar-h63xx-build.git] / org.handhelds.familiar / classes / base.bbclass

diff --git a/org.handhelds.familiar/classes/base.bbclass b/org.handhelds.familiar/classes/base.bbclass
index c5359b20f85628440b0e63176dc1ef633ab41a5d..66563f34d379452fecbf251266fcb0b6d4427532 100644 (file)
--- a/org.handhelds.familiar/classes/base.bbclass
+++ b/org.handhelds.familiar/classes/base.bbclass
@@ -174,6 +174,8 @@ oe_libinstall() {
        if [ -d "$dir/.libs" ]; then
                dir=$dir/.libs
        fi
+       dotlai=$libname.lai
+       dir=$dir`(cd $dir; find -name "$dotlai") | sed "s/^\.//;s/\/$dotlai\$//;q"`
        olddir=`pwd`
        __runcmd cd $dir
 
@@ -191,14 +193,13 @@ oe_libinstall() {
        if [ -f "$dota" -o -n "$require_static" ]; then
                __runcmd install -m 0644 $dota $destpath/
        fi
-       dotlai=$libname.lai
        if [ -f "$dotlai" -a -n "$libtool" ]; then
                if test -n "$staging_install"
                then
                        # stop libtool using the final directory name for libraries
                        # in staging:
                        __runcmd rm -f $destpath/$libname.la
-                       __runcmd sed -e 's/^installed=yes$/installed=no/' $dotlai >$destpath/$libname.la
+                       __runcmd sed -e 's/^installed=yes$/installed=no/' -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' $dotlai >$destpath/$libname.la
                else
                        __runcmd install -m 0644 $dotlai $destpath/$libname.la
                fi
@@ -512,12 +513,12 @@ python base_eventhandler() {
                bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
                path_to_bbfiles = bb.data.getVar( 'BBFILES', e.data, 1 )
                path_to_packages = path_to_bbfiles[:path_to_bbfiles.index( "packages" )]
-               monotone_revision = "<unknown>"
-               try:
-                       monotone_revision = file( "%s/MT/revision" % path_to_packages ).read().strip()
-               except IOError:
-                       pass
-               bb.data.setVar( 'OE_REVISION', monotone_revision, e.data )
+               #monotone_revision = "<unknown>"
+               #try:
+               #       monotone_revision = file( "%s/MT/revision" % path_to_packages ).read().strip()
+               #except IOError:
+               #       pass
+               #bb.data.setVar( 'OE_REVISION', monotone_revision, e.data )
                statusvars = ['BB_VERSION', 'OE_REVISION', 'TARGET_ARCH', 'TARGET_OS', 'MACHINE', 'DISTRO', 'TARGET_FPU']
                statuslines = ["%-13s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars]
                statusmsg = "\nOE Build Configuration:\n%s\n" % '\n'.join(statuslines)