From 2c7b3abb44413bdc039f0ac52a8d9b9ef147a724 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 4 Oct 2010 15:22:10 -0700 Subject: [PATCH] libtool-sdk: Convert from legacy staging Since these are ${HOST_SYS} specific we make ${HOST_SYS}-libtool here. Signed-off-by: Tom Rini --- recipes/libtool/libtool-sdk_2.2.6a.bb | 26 +++----------------------- recipes/libtool/libtool-sdk_2.2.6b.bb | 26 +++----------------------- 2 files changed, 6 insertions(+), 46 deletions(-) diff --git a/recipes/libtool/libtool-sdk_2.2.6a.bb b/recipes/libtool/libtool-sdk_2.2.6a.bb index f7d6cb58a6..ff87873d9d 100644 --- a/recipes/libtool/libtool-sdk_2.2.6a.bb +++ b/recipes/libtool/libtool-sdk_2.2.6a.bb @@ -1,6 +1,6 @@ require libtool_${PV}.bb -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI_append = " file://cross_compile.patch" inherit sdk @@ -8,6 +8,7 @@ inherit sdk do_install () { install -d ${D}${bindir}/ install -m 0755 libtool ${D}${bindir}/ + install -m 0755 libtool ${D}${bindir}/${HOST_SYS}-libtool install -m 0755 libtoolize ${D}${bindir}/ install -d ${D}${libdir}/ @@ -30,25 +31,4 @@ do_install () { install -c -m 0644 ${S}/libltdl/m4/lt~obsolete.m4 ${D}${datadir}/aclocal/ } -do_stage () { - install -d ${STAGING_BINDIR}/ - install -m 0755 libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool - install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize - - oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR} - install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ - - install -d ${STAGING_DATADIR}/libtool/config/ - install -c ${S}/libltdl/config/config.guess ${STAGING_DATADIR}/libtool/ - install -c ${S}/libltdl/config/config.sub ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DATADIR}/libtool/config/ - - install -d ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltoptions.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltversion.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltsugar.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/lt~obsolete.m4 ${STAGING_DATADIR}/aclocal/ -} +NATIVE_INSTALL_WORKS = "1" diff --git a/recipes/libtool/libtool-sdk_2.2.6b.bb b/recipes/libtool/libtool-sdk_2.2.6b.bb index f7d6cb58a6..ff87873d9d 100644 --- a/recipes/libtool/libtool-sdk_2.2.6b.bb +++ b/recipes/libtool/libtool-sdk_2.2.6b.bb @@ -1,6 +1,6 @@ require libtool_${PV}.bb -PR = "${INC_PR}.0" +PR = "${INC_PR}.1" SRC_URI_append = " file://cross_compile.patch" inherit sdk @@ -8,6 +8,7 @@ inherit sdk do_install () { install -d ${D}${bindir}/ install -m 0755 libtool ${D}${bindir}/ + install -m 0755 libtool ${D}${bindir}/${HOST_SYS}-libtool install -m 0755 libtoolize ${D}${bindir}/ install -d ${D}${libdir}/ @@ -30,25 +31,4 @@ do_install () { install -c -m 0644 ${S}/libltdl/m4/lt~obsolete.m4 ${D}${datadir}/aclocal/ } -do_stage () { - install -d ${STAGING_BINDIR}/ - install -m 0755 libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool - install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize - - oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR} - install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ - - install -d ${STAGING_DATADIR}/libtool/config/ - install -c ${S}/libltdl/config/config.guess ${STAGING_DATADIR}/libtool/ - install -c ${S}/libltdl/config/config.sub ${STAGING_DATADIR}/libtool/ - install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DATADIR}/libtool/config/ - - install -d ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltoptions.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltversion.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltsugar.m4 ${STAGING_DATADIR}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/lt~obsolete.m4 ${STAGING_DATADIR}/aclocal/ -} +NATIVE_INSTALL_WORKS = "1" -- 2.39.5