summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libtool
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-16 23:59:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-21 16:48:51 +0000
commit5c647340127bf3d0b00a4a28ec7bf308e277f881 (patch)
treef901e31f418bec8488462b668863099d1d605bfb /meta/recipes-devtools/libtool
parent0b640a419cbc19752390cca35440707b9bfae0fa (diff)
downloadpoky-5c647340127bf3d0b00a4a28ec7bf308e277f881.tar.gz
libtool-cross: Unbreak and actually use more of it
We should be using libtool-cross for cross compiling but were not. This patch sets datadir so libtoolize ends up containing correct paths. It then installs libtoolize. The path ltmain.sh was installed to was incorrect and this is fixed. We also now install all the libtool m4 macros and config files. (From OE-Core rev: d52bdbee35bb6edc55eed613f869e46d0c0a2f31) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/libtool')
-rw-r--r--meta/recipes-devtools/libtool/libtool-cross_2.4.bb26
1 files changed, 15 insertions, 11 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
index 6d512b1962..5c06987195 100644
--- a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
+++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb
@@ -4,6 +4,8 @@ PR = "r4"
4PACKAGES = "" 4PACKAGES = ""
5SRC_URI += "file://prefix.patch" 5SRC_URI += "file://prefix.patch"
6 6
7datadir = "${STAGING_DIR_TARGET}${target_datadir}"
8
7do_configure_prepend () { 9do_configure_prepend () {
8 # Remove any existing libtool m4 since old stale versions would break 10 # Remove any existing libtool m4 since old stale versions would break
9 # any upgrade 11 # any upgrade
@@ -12,20 +14,22 @@ do_configure_prepend () {
12} 14}
13 15
14do_install () { 16do_install () {
15 install -d ${D}${bindir}/ 17 install -d ${D}${bindir_crossscripts}/
16 install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/${HOST_SYS}-libtool 18 install -m 0755 ${HOST_SYS}-libtool ${D}${bindir_crossscripts}/${HOST_SYS}-libtool
17 install -d ${D}${datadir}/libtool/ 19 install -d ${D}${bindir_crossscripts}/
18 install -d ${D}${datadir}/aclocal/ 20 install -m 0755 libtoolize ${D}${bindir_crossscripts}/
19 install -c ${S}/libltdl/config/config.guess ${D}${datadir}/libtool/ 21 install -d ${D}${target_datadir}/libtool/config/
20 install -c ${S}/libltdl/config/config.sub ${D}${datadir}/libtool/ 22 install -d ${D}${target_datadir}/aclocal/
21 install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${D}${datadir}/libtool/ 23 install -c ${S}/libltdl/config/config.guess ${D}${target_datadir}/libtool/config/
22 install -c -m 0644 ${S}/libltdl/m4/libtool.m4 ${D}${datadir}/aclocal/ 24 install -c ${S}/libltdl/config/config.sub ${D}${target_datadir}/libtool/config/
23 install -c -m 0644 ${S}/libltdl/m4/ltdl.m4 ${D}${datadir}/aclocal/ 25 install -c ${S}/libltdl/config/install-sh ${D}${target_datadir}/libtool/config/
26 install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${D}${target_datadir}/libtool/config/
27 install -c -m 0644 ${S}/libltdl/m4/*.m4 ${D}${target_datadir}/aclocal/
24} 28}
25 29
26SYSROOT_PREPROCESS_FUNCS += "libtoolcross_sysroot_preprocess" 30SYSROOT_PREPROCESS_FUNCS += "libtoolcross_sysroot_preprocess"
27 31
28libtoolcross_sysroot_preprocess () { 32libtoolcross_sysroot_preprocess () {
29 install -d ${SYSROOT_DESTDIR}${bindir_crossscripts} 33 sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts}
30 install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${bindir_crossscripts}/${HOST_SYS}-libtool 34 sysroot_stage_dir ${D}${target_datadir} ${SYSROOT_DESTDIR}${target_datadir}
31} 35}