summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2004-05-14 04:49:22 +0000
committerChris Larson <clarson@kergoth.com>2004-05-14 04:49:22 +0000
commit1bdd596edc005a9ad8e122e4f895123b71eeacce (patch)
tree92f60256c8c4add2c6b5d0a1db4c0c29f024f985
parent920e895930cae9cb0ef870bfb0e7d502f638364d (diff)
Fix libtool-native per the recent staging share split.
BKrev: 40a44fd2VCIp91oDU1FA5hLrx89tmQ
-rw-r--r--libtool/libtool-native_1.5.oe45
1 files changed, 20 insertions, 25 deletions
diff --git a/libtool/libtool-native_1.5.oe b/libtool/libtool-native_1.5.oe
index 789ee5f4df..184543eae9 100644
--- a/libtool/libtool-native_1.5.oe
+++ b/libtool/libtool-native_1.5.oe
@@ -1,38 +1,33 @@
PR = "r1"
include libtool_${PV}.oe
+
+STAGING_DATADIR_safe := "${STAGING_DATADIR}"
+
inherit native
FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/libtool-${PV}"
SRC_URI_append = " file://${FILESDIR}/libdir-la.patch;patch=1 \
- file://${FILESDIR}/sedvar.patch;patch=1 \
- file://${FILESDIR}/tag.patch;patch=1 \
- file://${FILESDIR}/ld.patch;patch=1 \
- file://${FILESDIR}/chmod.patch;patch=1 \
- file://${FILESDIR}/install-path-check.patch;patch=1"
+ file://${FILESDIR}/sedvar.patch;patch=1 \
+ file://${FILESDIR}/tag.patch;patch=1 \
+ file://${FILESDIR}/ld.patch;patch=1 \
+ file://${FILESDIR}/chmod.patch;patch=1 \
+ file://${FILESDIR}/install-path-check.patch;patch=1"
S = "${WORKDIR}/libtool-${PV}"
do_stage () {
- oe_runmake install
- install -d ${STAGING_DATADIR}/libtool \
- ${STAGING_DATADIR}/aclocal
- install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool
- install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize
- install -c config.guess ${STAGING_DATADIR}/libtool/config.guess
- install -c config.sub ${STAGING_DATADIR}/libtool/config.sub
- install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/
- install -c -m 0644 m4/libtool.m4 ${STAGING_DATADIR}/aclocal/
- install -c -m 0644 m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/
-
+ install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool
+ install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize
oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR}
- install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
-
- install -d ${CROSS_DATADIR}/libtool/
- install -d ${CROSS_DATADIR}/aclocal/
- install -c config.guess ${CROSS_DATADIR}/libtool/config.guess
- install -c config.sub ${CROSS_DATADIR}/libtool/config.sub
- install -c -m 0644 ltmain.sh ${CROSS_DATADIR}/libtool/
- install -c -m 0644 m4/libtool.m4 ${CROSS_DATADIR}/aclocal/
- install -c -m 0644 m4/ltdl.m4 ${CROSS_DATADIR}/aclocal/
+ install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
+ for dir in ${STAGING_DATADIR} ${STAGING_DATADIR_safe}; do
+ install -d $dir/libtool \
+ $dir/aclocal
+ install -c config.guess $dir/libtool/config.guess
+ install -c config.sub $dir/libtool/config.sub
+ install -c -m 0644 ltmain.sh $dir/libtool/
+ install -c -m 0644 m4/libtool.m4 $dir/aclocal/
+ install -c -m 0644 m4/ltdl.m4 $dir/aclocal/
+ done
}
do_install () {