summaryrefslogtreecommitdiffstats
path: root/meta/packages/libtool
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-17 00:15:07 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-17 00:15:07 +0000
commit5b8b6c6bc71f39fc481e7a275570b615f27127ea (patch)
tree83cf488ec056315defa44836fed8bc5e461e93a9 /meta/packages/libtool
parentb6a0684f262cf112e4fca1c1249e50274b678ec7 (diff)
downloadpoky-5b8b6c6bc71f39fc481e7a275570b615f27127ea.tar.gz
libtool: Convert various varients to use do_install for staging
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/libtool')
-rw-r--r--meta/packages/libtool/libtool-cross_2.2.6.bb31
-rw-r--r--meta/packages/libtool/libtool-native_2.2.6.bb23
-rw-r--r--meta/packages/libtool/libtool-nativesdk_2.2.6.bb46
-rw-r--r--meta/packages/libtool/libtool_2.2.6.bb9
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 232190fe46..7edefc9cd9 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"
14#SRC_URI_append_linux = "${DOLT_PATCH}" 14#SRC_URI_append_linux = "${DOLT_PATCH}"
15#SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}" 15#SRC_URI_append_linux-gnueabi = "${DOLT_PATCH}"
16 16
17prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
18exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
19bindir = "${STAGING_BINDIR_NATIVE}"
20
21do_compile () { 17do_compile () {
22 : 18 :
23} 19}
24 20
25do_stage () { 21do_install () {
26 install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool 22 install -d ${D}${bindir}/
27 install -d ${STAGING_DIR_HOST}${target_datadir}/libtool ${STAGING_DIR_HOST}${target_datadir}/aclocal 23 install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/${HOST_SYS}-libtool
28 install -c ${S}/libltdl/config/config.guess ${STAGING_DIR_HOST}${target_datadir}/libtool/ 24 install -d ${D}${datadir}/libtool/
29 install -c ${S}/libltdl/config/config.sub ${STAGING_DIR_HOST}${target_datadir}/libtool/ 25 install -d ${D}${datadir}/aclocal/
30 install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DIR_HOST}${target_datadir}/libtool/ 26 install -c ${S}/libltdl/config/config.guess ${D}${datadir}/libtool/
31 install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ 27 install -c ${S}/libltdl/config/config.sub ${D}${datadir}/libtool/
32 install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ 28 install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${D}${datadir}/libtool/
33 install -c -m 0644 ${WORKDIR}/dolt.m4 ${STAGING_DIR_HOST}${target_datadir}/aclocal/ 29 install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${D}${datadir}/aclocal/
30 install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${D}${datadir}/aclocal/
31 install -c -m 0644 ${WORKDIR}/dolt.m4 ${D}${datadir}/aclocal/
34} 32}
35 33
36do_install () { 34SYSROOT_PREPROCESS_FUNCS += "libtoolcross_sysroot_preprocess"
37 : 35
36libtoolcross_sysroot_preprocess () {
37 install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/
38 install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool
38} 39}
diff --git a/meta/packages/libtool/libtool-native_2.2.6.bb b/meta/packages/libtool/libtool-native_2.2.6.bb
index 92dcc3515f..5d813b5211 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 () {
13 rm -f ${STAGING_DATADIR}/aclocal/lt*.m4 13 rm -f ${STAGING_DATADIR}/aclocal/lt*.m4
14} 14}
15 15
16do_stage () {
17 install -m 0755 ${HOST_SYS}-libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool
18 install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize
19 oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR}
20 install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
21 install -d ${STAGING_INCDIR}/libltdl
22 install -m 0644 libltdl/libltdl/*.h ${STAGING_INCDIR}/libltdl/
23 install -d ${STAGING_DATADIR}/libtool/config/ ${STAGING_DATADIR}/aclocal/
24 install -c ${S}/libltdl/config/config.guess ${STAGING_DATADIR}/libtool/
25 install -c ${S}/libltdl/config/config.sub ${STAGING_DATADIR}/libtool/
26 install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DATADIR}/libtool/config/
27 install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DATADIR}/aclocal/
28 install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/
29 install -c -m 0644 ${S}/libltdl/m4/ltoptions.m4 ${STAGING_DATADIR}/aclocal/
30 install -c -m 0644 ${S}/libltdl/m4/ltversion.m4 ${STAGING_DATADIR}/aclocal/
31 install -c -m 0644 ${S}/libltdl/m4/ltsugar.m4 ${STAGING_DATADIR}/aclocal/
32 install -c -m 0644 ${S}/libltdl/m4/lt~obsolete.m4 ${STAGING_DATADIR}/aclocal/
33}
34
35do_install () { 16do_install () {
36 : 17 autotools_do_install
18 install -d ${D}${bindir}/
19 install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/${HOST_SYS}-libtool
37} 20}
diff --git a/meta/packages/libtool/libtool-nativesdk_2.2.6.bb b/meta/packages/libtool/libtool-nativesdk_2.2.6.bb
index 2f918a27e2..537647cbac 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"
6inherit nativesdk 6inherit nativesdk
7 7
8do_install () { 8do_install () {
9 autotools_do_install
9 install -d ${D}${bindir}/ 10 install -d ${D}${bindir}/
10 install -m 0755 libtool ${D}${bindir}/ 11 install -m 0755 libtool ${D}${bindir}/
11 install -m 0755 libtoolize ${D}${bindir}/
12
13 install -d ${D}${libdir}/
14 oe_libinstall -a -so -C libltdl libltdl ${D}${libdir}
15
16 install -d ${D}${includedir}/
17 install -m 0644 libltdl/ltdl.h ${D}${includedir}
18
19 install -d ${D}${datadir}/libtool/config/
20 install -c ${S}/libltdl/config/config.guess ${D}${datadir}/libtool/
21 install -c ${S}/libltdl/config/config.sub ${D}${datadir}/libtool/
22 install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${D}${datadir}/libtool/config/
23
24 install -d ${D}${datadir}/aclocal/
25 install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${D}${datadir}/aclocal/
26 install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${D}${datadir}/aclocal/
27 install -c -m 0644 ${S}/libltdl/m4/ltoptions.m4 ${D}${datadir}/aclocal/
28 install -c -m 0644 ${S}/libltdl/m4/ltversion.m4 ${D}${datadir}/aclocal/
29 install -c -m 0644 ${S}/libltdl/m4/ltsugar.m4 ${D}${datadir}/aclocal/
30 install -c -m 0644 ${S}/libltdl/m4/lt~obsolete.m4 ${D}${datadir}/aclocal/
31} 12}
32 13
33do_stage () { 14SYSROOT_PREPROCESS_FUNCS += "libtoolnativesdk_sysroot_preprocess"
34 install -d ${STAGING_BINDIR}/
35 install -m 0755 libtool ${STAGING_BINDIR}/${HOST_SYS}-libtool
36 install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize
37
38 install -d ${STAGING_INCDIR}
39 install -d ${STAGING_LIBDIR}
40 oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR}
41 install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
42
43 install -d ${STAGING_DATADIR}/libtool/config/
44 install -c ${S}/libltdl/config/config.guess ${STAGING_DATADIR}/libtool/
45 install -c ${S}/libltdl/config/config.sub ${STAGING_DATADIR}/libtool/
46 install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${STAGING_DATADIR}/libtool/config/
47 15
48 install -d ${STAGING_DATADIR}/aclocal/ 16libtoolnativesdk_sysroot_preprocess () {
49 install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${STAGING_DATADIR}/aclocal/ 17 install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/
50 install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${STAGING_DATADIR}/aclocal/ 18 install -m 755 ${D}${bindir}/libtool ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool
51 install -c -m 0644 ${S}/libltdl/m4/ltoptions.m4 ${STAGING_DATADIR}/aclocal/
52 install -c -m 0644 ${S}/libltdl/m4/ltversion.m4 ${STAGING_DATADIR}/aclocal/
53 install -c -m 0644 ${S}/libltdl/m4/ltsugar.m4 ${STAGING_DATADIR}/aclocal/
54 install -c -m 0644 ${S}/libltdl/m4/lt~obsolete.m4 ${STAGING_DATADIR}/aclocal/
55} 19}
diff --git a/meta/packages/libtool/libtool_2.2.6.bb b/meta/packages/libtool/libtool_2.2.6.bb
index e552ea24c7..eb34e79c1b 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.*"
11FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h" 11FILES_libltdl-dev = "${libdir}/libltdl.* ${includedir}/ltdl.h"
12FILES_libltdl-dbg = "${libdir}/.debug/" 12FILES_libltdl-dbg = "${libdir}/.debug/"
13 13
14inherit autotools 14inherit autotools_stage
15 15
16EXTRA_AUTORECONF = "--exclude=libtoolize" 16EXTRA_AUTORECONF = "--exclude=libtoolize"
17
18do_stage() {
19 install -d ${STAGING_INCDIR}/libltdl
20 install -m 0644 libltdl/ltdl.h ${STAGING_INCDIR}/
21 install -m 0644 libltdl/libltdl/*.h ${STAGING_INCDIR}/libltdl/
22 oe_libinstall -a -so -C libltdl libltdl ${STAGING_LIBDIR}
23}