From 5b8b6c6bc71f39fc481e7a275570b615f27127ea Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 17 Nov 2009 00:15:07 +0000 Subject: libtool: Convert various varients to use do_install for staging Signed-off-by: Richard Purdie --- meta/packages/libtool/libtool-cross_2.2.6.bb | 31 ++++++++-------- meta/packages/libtool/libtool-native_2.2.6.bb | 23 ++---------- meta/packages/libtool/libtool-nativesdk_2.2.6.bb | 46 +++--------------------- meta/packages/libtool/libtool_2.2.6.bb | 9 +---- 4 files changed, 25 insertions(+), 84 deletions(-) diff --git a/meta/packages/libtool/libtool-cross_2.2.6.bb b/meta/packages/libtool/libtool-cross_2.2.6.bb index 232190fe4..7edefc9cd 100644 --- a/meta/packages/libtool/libtool-cross_2.2.6.bb +++ b/meta/packages/libtool/libtool-cross_2.2.6.bb @@ -14,25 +14,26 @@ DOLT_PATCH_i586 = " file://add_dolt.patch;patch=1" #SRC_URI_append_linux = "${DOLT_PATCH}" #SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}" -prefix = "${STAGING_DIR_NATIVE}${prefix_native}" -exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}" -bindir = "${STAGING_BINDIR_NATIVE}" - do_compile () { : } -do_stage () { - install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool - install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal - install -c ${S}/libltdl/config/config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/ - install -c ${S}/libltdl/config/config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/ - install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/ - install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ - install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ +do_install () { + install -d ${D}${bindir}/ + install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/${HOST_SYS}-libtool + install -d ${D}${datadir}/libtool/ + install -d ${D}${datadir}/aclocal/ + install -c ${S}/libltdl/config/config.guess ${D}${datadir}/libtool/ + install -c ${S}/libltdl/config/config.sub ${D}${datadir}/libtool/ + install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${D}${datadir}/libtool/ + install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${D}${datadir}/aclocal/ + install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${D}${datadir}/aclocal/ + install -c -m 0644 ${WORKDIR}/dolt.m4 ${D}${datadir}/aclocal/ } -do_install () { - : +SYSROOT_PREPROCESS_FUNCS += "libtoolcross_sysroot_preprocess" + +libtoolcross_sysroot_preprocess () { + install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/ + install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool } diff --git a/meta/packages/libtool/libtool-native_2.2.6.bb b/meta/packages/libtool/libtool-native_2.2.6.bb index 92dcc3515..5d813b521 100644 --- a/meta/packages/libtool/libtool-native_2.2.6.bb +++ b/meta/packages/libtool/libtool-native_2.2.6.bb @@ -13,25 +13,8 @@ do_configure_prepend () { rm -f ${STAGING_DATADIR}/aclocal/lt*.m4 } -do_stage () { - 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 ${STAGING_INCDIR}/libltdl - install -m 0644 libltdl/libltdl/*.h ${STAGING_INCDIR}/libltdl/ - install -d ${STAGING_DATADIR}/libtool/config/ ${STAGING_DATADIR}/aclocal/ - 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 -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/ -} - do_install () { - : + autotools_do_install + install -d ${D}${bindir}/ + install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/${HOST_SYS}-libtool } diff --git a/meta/packages/libtool/libtool-nativesdk_2.2.6.bb b/meta/packages/libtool/libtool-nativesdk_2.2.6.bb index 2f918a27e..537647cba 100644 --- a/meta/packages/libtool/libtool-nativesdk_2.2.6.bb +++ b/meta/packages/libtool/libtool-nativesdk_2.2.6.bb @@ -6,50 +6,14 @@ SRC_URI_append = " file://cross_compile.patch;patch=1" inherit nativesdk do_install () { + autotools_do_install install -d ${D}${bindir}/ install -m 0755 libtool ${D}${bindir}/ - install -m 0755 libtoolize ${D}${bindir}/ - - install -d ${D}${libdir}/ - oe_libinstall -a -so -C libltdl libltdl ${D}${libdir} - - install -d ${D}${includedir}/ - install -m 0644 libltdl/ltdl.h ${D}${includedir} - - install -d ${D}${datadir}/libtool/config/ - install -c ${S}/libltdl/config/config.guess ${D}${datadir}/libtool/ - install -c ${S}/libltdl/config/config.sub ${D}${datadir}/libtool/ - install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${D}${datadir}/libtool/config/ - - install -d ${D}${datadir}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${D}${datadir}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${D}${datadir}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltoptions.m4 ${D}${datadir}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltversion.m4 ${D}${datadir}/aclocal/ - install -c -m 0644 ${S}/libltdl/m4/ltsugar.m4 ${D}${datadir}/aclocal/ - 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 - - install -d ${STAGING_INCDIR} - install -d ${STAGING_LIBDIR} - oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR} - 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/ +SYSROOT_PREPROCESS_FUNCS += "libtoolnativesdk_sysroot_preprocess" - 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/ +libtoolnativesdk_sysroot_preprocess () { + install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/ + install -m 755 ${D}${bindir}/libtool ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool } diff --git a/meta/packages/libtool/libtool_2.2.6.bb b/meta/packages/libtool/libtool_2.2.6.bb index e552ea24c..eb34e79c1 100644 --- a/meta/packages/libtool/libtool_2.2.6.bb +++ b/meta/packages/libtool/libtool_2.2.6.bb @@ -11,13 +11,6 @@ FILES_libltdl = "${libdir}/libltdl.so.*" FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h" FILES_libltdl-dbg = "${libdir}/.debug/" -inherit autotools +inherit autotools_stage EXTRA_AUTORECONF = "--exclude=libtoolize" - -do_stage() { - install -d ${STAGING_INCDIR}/libltdl - install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/ - install -m 0644 libltdl/libltdl/*.h ${STAGING_INCDIR}/libltdl/ - oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR} -} -- cgit v1.2.3