[oe-commits] Julian_chu : autotools.bbclass: adding do_install_append() to autotools. bbclass
GIT User account
git at amethyst.openembedded.net
Mon Jan 12 06:10:55 UTC 2009
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 4057635c8f602b44f954b8181cd8746c06374bcf
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4057635c8f602b44f954b8181cd8746c06374bcf
Author: Julian_chu <julian_chu at openmoko.com>
Date: Sun Jul 27 22:56:58 2008 +0800
autotools.bbclass: adding do_install_append() to autotools.bbclass
This function is used to correct .la files. Many bb files use their
own do_install so just adding this into the original
autoclass_do_install won't work. This ensures the .la files contain
correct path.
---
classes/autotools.bbclass | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index adb57f6..fd8687e 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -142,13 +142,20 @@ autotools_do_configure() {
autotools_do_install() {
oe_runmake 'DESTDIR=${D}' install
+}
+do_install_append() {
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
+ sed -i -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${libdir}/\1,g' $i
+ sed -i -e s:${CROSS_DIR}/${HOST_SYS}::g $i
+ sed -i -e s:${CROSS_DIR}::g $i
+ sed -i -e s:${STAGING_LIBDIR}:${libdir}:g $i
+ sed -i -e s:${STAGING_DIR_HOST}::g $i
+ sed -i -e s:${STAGING_DIR}::g $i
+ sed -i -e s:${S}::g $i
+ sed -i -e s:${T}::g $i
+ sed -i -e s:${D}::g $i
+ done
}
STAGE_TEMP="${WORKDIR}/temp-staging"
More information about the Openembedded-commits
mailing list