diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2010-11-08 11:10:56 -0800 |
|---|---|---|
| committer | Saul Wold <Saul.Wold@intel.com> | 2010-11-18 13:30:25 -0800 |
| commit | 563953df47785bf57969d86b9b5f8494e585a28c (patch) | |
| tree | 4b9d4cdb858f08894503dcd5233e6bcf5ed7ab6e /meta/recipes-devtools/libtool/libtool-cross_2.4.bb | |
| parent | aa5befab23679e07441805e18d9b6f3f271b5ed5 (diff) | |
| download | poky-563953df47785bf57969d86b9b5f8494e585a28c.tar.gz | |
libtool upgrade from 2.2.10 to 2.4
Taking out of this code from patch as the newer upstream code has fix,
and this patch is not needed.
cross-compile.patch:
-Index: libtool-2.2.10/libltdl/config/ltmain.m4sh
+Index: libtool-2.4/libltdl/config/ltmain.m4sh
===================================================================
---- libtool-2.2.10.orig/libltdl/config/ltmain.m4sh
-+++ libtool-2.2.10/libltdl/config/ltmain.m4sh
-@@ -5147,8 +5147,14 @@ func_mode_link ()
- absdir="$abs_ladir"
- libdir="$abs_ladir"
- else
-- dir="$libdir"
-- absdir="$libdir"
-+ # Adding 'libdir' from the .la file to our library search
paths
-+ # breaks crosscompilation horribly. We cheat here and don't
add
-+ # it, instead adding the path where we found the .la. -CL
-+ dir="$abs_ladir"
-+ absdir="$abs_ladir"
-+ libdir="$abs_ladir"
-+ #dir="$libdir"
-+ #absdir="$libdir"
- fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
- else
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Diffstat (limited to 'meta/recipes-devtools/libtool/libtool-cross_2.4.bb')
| -rw-r--r-- | meta/recipes-devtools/libtool/libtool-cross_2.4.bb | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb new file mode 100644 index 0000000000..6ea96a5537 --- /dev/null +++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.bb | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | require libtool_${PV}.bb | ||
| 2 | |||
| 3 | PR = "r0" | ||
| 4 | PACKAGES = "" | ||
| 5 | SRC_URI_append = " file://cross_compile.patch \ | ||
| 6 | file://prefix.patch " | ||
| 7 | |||
| 8 | DEPENDS += "libtool-native" | ||
| 9 | |||
| 10 | do_configure_prepend () { | ||
| 11 | # Remove any existing libtool m4 since old stale versions would break | ||
| 12 | # any upgrade | ||
| 13 | rm -f ${STAGING_DATADIR}/aclocal/libtool.m4 | ||
| 14 | rm -f ${STAGING_DATADIR}/aclocal/lt*.m4 | ||
| 15 | } | ||
| 16 | |||
| 17 | do_install () { | ||
| 18 | install -d ${D}${bindir}/ | ||
| 19 | install -m 0755 ${HOST_SYS}-libtool ${D}${bindir}/${HOST_SYS}-libtool | ||
| 20 | install -d ${D}${datadir}/libtool/ | ||
| 21 | install -d ${D}${datadir}/aclocal/ | ||
| 22 | install -c ${S}/libltdl/config/config.guess ${D}${datadir}/libtool/ | ||
| 23 | install -c ${S}/libltdl/config/config.sub ${D}${datadir}/libtool/ | ||
| 24 | install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${D}${datadir}/libtool/ | ||
| 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 | } | ||
| 28 | |||
| 29 | SYSROOT_PREPROCESS_FUNCS += "libtoolcross_sysroot_preprocess" | ||
| 30 | |||
| 31 | libtoolcross_sysroot_preprocess () { | ||
| 32 | install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/ | ||
| 33 | install -m 755 ${D}${bindir}/${HOST_SYS}-libtool ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool | ||
| 34 | } | ||
