diff options
| author | Julian_chu <julian_chu@openmoko.com> | 2008-07-27 22:56:58 +0800 |
|---|---|---|
| committer | John Lee <john_lee@openmoko.org> | 2009-01-12 14:04:29 +0800 |
| commit | 4057635c8f602b44f954b8181cd8746c06374bcf (patch) | |
| tree | 892c169c380e7c2c2e195093957c8c65029510b3 /classes | |
| parent | ccd72dd30fd9de6c06c9a2e03a84d862c3969386 (diff) | |
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.
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/autotools.bbclass | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index adb57f6cc9..fd8687ebb6 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" |