libtool: Upgrade from 2.4 -> 2.4.2

Rebased patches to the newer source code and deleted resolve-sysroot.patch
since its already applied upstream

merged libtool-2.4.2.inc & libtool.inc files

replaced PR with ${INC_PR}.0

(From OE-Core rev: aa0cb889a4ef883235dc3f3e1d76ee4a556ae03a)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 36 insertions, 0 deletions

diff --git a/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb b/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
new file mode 100644
index 0000000000..5003c9bd2c
--- /dev/null
+++ b/meta/recipes-devtools/libtool/libtool-cross_2.4.2.bb
@@ -0,0 +1,36 @@
+require libtool-${PV}.inc
+
+PR = "${INC_PR}.0"
+PACKAGES = ""
+SRC_URI += "file://prefix.patch"
+SRC_URI += "file://fixinstall.patch"
+
+datadir = "${STAGING_DIR_TARGET}${target_datadir}"
+
+do_configure_prepend () {
+        # Remove any existing libtool m4 since old stale versions would break
+        # any upgrade
+        rm -f ${STAGING_DATADIR}/aclocal/libtool.m4
+        rm -f ${STAGING_DATADIR}/aclocal/lt*.m4
+}
+
+do_install () {
+        install -d ${D}${bindir_crossscripts}/
+        install -m 0755 ${HOST_SYS}-libtool ${D}${bindir_crossscripts}/${HOST_SYS}-libtool
+        install -d ${D}${bindir_crossscripts}/
+        install -m 0755 libtoolize ${D}${bindir_crossscripts}/
+        install -d ${D}${target_datadir}/libtool/config/
+        install -d ${D}${target_datadir}/aclocal/
+        install -c ${S}/libltdl/config/config.guess ${D}${target_datadir}/libtool/config/
+        install -c ${S}/libltdl/config/config.sub ${D}${target_datadir}/libtool/config/
+        install -c ${S}/libltdl/config/install-sh ${D}${target_datadir}/libtool/config/
+        install -c -m 0644 ${S}/libltdl/config/ltmain.sh ${D}${target_datadir}/libtool/config/
+        install -c -m 0644 ${S}/libltdl/m4/*.m4 ${D}${target_datadir}/aclocal/
+}
+
+SYSROOT_PREPROCESS_FUNCS += "libtoolcross_sysroot_preprocess"
+
+libtoolcross_sysroot_preprocess () {
+        sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts}
+        sysroot_stage_dir ${D}${target_datadir} ${SYSROOT_DESTDIR}${target_datadir}
+}