]> git.openpandora.org Git - openembedded.git/commitdiff
autotools.bbclass: Add new pattern to match -L<libdir> in dependency_libs
authorKhem Raj <raj.khem@gmail.com>
Tue, 10 Mar 2009 18:00:09 +0000 (11:00 -0700)
committerKhem Raj <raj.khem@gmail.com>
Tue, 10 Mar 2009 18:00:09 +0000 (11:00 -0700)
* Current pattern match does one think wrong consider
something like this
dependency_libs=' -L/home/kraj/work/oe/build/eglibc/omap5912osk/work/x86_64-linux/ncurses-native-5.4-r17/ncurses-5.4/lib'
this pattern when matched gets converted to
dependency_libs=' -L/home/kraj/work/oe/build/eglibc/omap5912osk/staging/x86_64-linux/usr/lib/lib'
which is wrong. If we had a '/' appended to original path then it would work.
This patch lets it straight.

classes/autotools.bbclass

index fd8687ebb6dd3e61a45896746822d5c8df7b482c..20f371a987a20dc566a1ff9fc3bda15f1fa1c0d6 100644 (file)
@@ -212,7 +212,8 @@ autotools_stage_all() {
                for i in $las
                do
                        sed -e 's/^installed=yes$/installed=no/' \
-                           -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
+                           -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*.la\),${STAGING_LIBDIR}/\1,g' \
+                           -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR},g' \
                            -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
                            -i ${STAGE_TEMP}/${libdir}/$i
                done