aboutsummaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2008-05-12 13:22:14 +0000
committerRichard Purdie <rpurdie@rpsys.net>2008-05-12 13:22:14 +0000
commit496b9be8d169b09ae7fae0ea80f67c5f2f2c9acc (patch)
treed810507ba14a75d293cb21b5a73e40c82816d836 /classes
parent563b7f68d00564f31e1e1154639af3072198a481 (diff)
downloadopenembedded-496b9be8d169b09ae7fae0ea80f67c5f2f2c9acc.tar.gz
openembedded-496b9be8d169b09ae7fae0ea80f67c5f2f2c9acc.tar.bz2
openembedded-496b9be8d169b09ae7fae0ea80f67c5f2f2c9acc.zip
autotools.bbclass: Revert damage from 4b02add2b83e66d45ff3e840056487a7274d9011, convert autotools_stage_all to use sed on .la files instead of calling oe_libinstall, remove broken enable-mainainer-mode flag
Diffstat (limited to 'classes')
-rw-r--r--classes/autotools.bbclass26
1 files changed, 9 insertions, 17 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass
index 010f4ab620..7137876a93 100644
--- a/classes/autotools.bbclass
+++ b/classes/autotools.bbclass
@@ -58,7 +58,6 @@ oe_runconf () {
--oldincludedir=${oldincludedir} \
--infodir=${infodir} \
--mandir=${mandir} \
- --enable-mainainer-mode \
${EXTRA_OECONF} \
$@"
oenote "Running $cfgcmd..."
@@ -172,7 +171,7 @@ autotools_stage_dir() {
rmdir "$from" 2> /dev/null || true
if [ -d "$from" ]; then
mkdir -p "$to"
- cp -fpPR -t "$to" "$from"/*
+ cp -fpPR "$from"/* "$to"
fi
}
@@ -199,21 +198,14 @@ autotools_stage_all() {
las=$(find . -name \*.la -type f)
cd $olddir
echo "Found la files: $las"
- if [ -n "$las" ]; then
- # If there are .la files then libtool was used in the
- # build, so install them with magic mangling.
- for i in $las
- do
- dir=$(dirname $i)
- echo "oe_libinstall -C ${STAGE_TEMP}/${libdir}/${dir} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}"
- oe_libinstall -C ${STAGE_TEMP}/${libdir}/${dir} -so $(basename $i .la) ${STAGING_LIBDIR}/${dir}
- done
- else
- # Otherwise libtool wasn't used, and lib/ can be copied
- # directly.
- autotools_stage_dir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR}
- fi
-
+ 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,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
+ -i ${STAGE_TEMP}/${libdir}/$i
+ done
+ autotools_stage_dir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR}
fi
# Ok, this is nasty. pkgconfig.bbclass is usually used to install .pc files,
# however some packages rely on the presence of .pc files to enable/disable