diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-05-09 09:11:09 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-05-09 09:11:09 +0000 |
| commit | ebb524517a87b5433c89751c4c1a3768614f46ad (patch) | |
| tree | b31ba6c59d3f444311677cbb419367d38f34572b /meta/packages/libtool | |
| parent | 77a7221be47a594f1c94d91170ed2552e8e4b7ca (diff) | |
| download | openembedded-core-ebb524517a87b5433c89751c4c1a3768614f46ad.tar.gz openembedded-core-ebb524517a87b5433c89751c4c1a3768614f46ad.tar.bz2 openembedded-core-ebb524517a87b5433c89751c4c1a3768614f46ad.zip | |
libtool: Fix to work with multi architecture builds
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1618 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/libtool')
| -rw-r--r-- | meta/packages/libtool/libtool-cross_1.5.10.bb | 9 | ||||
| -rw-r--r-- | meta/packages/libtool/libtool-native_1.5.10.bb | 19 |
2 files changed, 15 insertions, 13 deletions
diff --git a/meta/packages/libtool/libtool-cross_1.5.10.bb b/meta/packages/libtool/libtool-cross_1.5.10.bb index fdc8f6ffaf..575448e447 100644 --- a/meta/packages/libtool/libtool-cross_1.5.10.bb +++ b/meta/packages/libtool/libtool-cross_1.5.10.bb @@ -1,7 +1,7 @@ SECTION = "devel" require libtool_${PV}.bb -PR = "r4" +PR = "r5" PACKAGES = "" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" SRC_URI_append = " file://libdir-la.patch;patch=1 \ @@ -21,6 +21,13 @@ do_compile () { do_stage () { install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool + install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ + install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal + install -c config.guess ${STAGING_DATADIR}/libtool/ + install -c config.sub ${STAGING_DATADIR}/libtool/ + install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/ + install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/ + install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/ } do_install () { diff --git a/meta/packages/libtool/libtool-native_1.5.10.bb b/meta/packages/libtool/libtool-native_1.5.10.bb index c8c406b1c8..6d8b1a1d7c 100644 --- a/meta/packages/libtool/libtool-native_1.5.10.bb +++ b/meta/packages/libtool/libtool-native_1.5.10.bb @@ -1,7 +1,7 @@ SECTION = "devel" require libtool_${PV}.bb -PR = "r4" +PR = "r5" FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libtool-${PV}" SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://prefix.patch;patch=1 \ @@ -10,8 +10,6 @@ SRC_URI_append = " file://libdir-la.patch;patch=1 \ file://install-path-check.patch;patch=1" S = "${WORKDIR}/libtool-${PV}" -STAGING_DATADIR_safe := "${STAGING_DATADIR}" - inherit native do_stage () { @@ -19,15 +17,12 @@ do_stage () { install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR} 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 libtool.m4 $dir/aclocal/ - install -c -m 0644 ltdl.m4 $dir/aclocal/ - done + install -d ${STAGING_DATADIR}/libtool ${STAGING_DATADIR}/aclocal + install -c config.guess ${STAGING_DATADIR}/libtool/ + install -c config.sub ${STAGING_DATADIR}/libtool/ + install -c -m 0644 ltmain.sh ${STAGING_DATADIR}/libtool/ + install -c -m 0644 libtool.m4 ${STAGING_DATADIR}/aclocal/ + install -c -m 0644 ltdl.m4 ${STAGING_DATADIR}/aclocal/ } do_install () { |