4 files changed, 78 insertions, 2 deletions
diff --git a/libtool/libtool-cross_1.5.6.oe b/libtool/libtool-cross_1.5.6.oe
index e69de29bb2..d071c9575c 100644
--- a/libtool/libtool-cross_1.5.6.oe
+++ b/libtool/libtool-cross_1.5.6.oe
@@ -0,0 +1,23 @@
+include libtool_${PV}.oe
+
+PACKAGES = ""
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/libtool-${PV}"
+SRC_URI_append = " file://${FILESDIR}/libdir-la.patch;patch=1 \
+                   file://${FILESDIR}/sedvar.patch;patch=1 \
+                   file://${FILESDIR}/tag.patch;patch=1 \
+                   file://${FILESDIR}/ld.patch;patch=1 \
+                   file://${FILESDIR}/chmod.patch;patch=1"
+S = "${WORKDIR}/libtool-${PV}"
+
+prefix = "${STAGING_DIR}"
+exec_prefix = "${prefix}/${BUILD_SYS}"
+
+do_compile () {
+}
+
+do_stage () {
+        install -m 0755 ${HOST_SYS}-libtool ${bindir}/${HOST_SYS}-libtool
+}
+
+do_install () {
+}
diff --git a/libtool/libtool-native_1.5.6.oe b/libtool/libtool-native_1.5.6.oe
index e69de29bb2..1f7421782b 100644
--- a/libtool/libtool-native_1.5.6.oe
+++ b/libtool/libtool-native_1.5.6.oe
@@ -0,0 +1,34 @@
+PR = "r1"
+include libtool_${PV}.oe
+
+STAGING_DATADIR_safe := "${STAGING_DATADIR}"
+
+inherit native
+
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/libtool-${PV}"
+#SRC_URI_append = " file://${FILESDIR}/libdir-la.patch;patch=1 \
+#		   file://${FILESDIR}/sedvar.patch;patch=1 \
+#		   file://${FILESDIR}/tag.patch;patch=1 \
+#		   file://${FILESDIR}/ld.patch;patch=1 \
+#		   file://${FILESDIR}/chmod.patch;patch=1 \
+#		   file://${FILESDIR}/install-path-check.patch;patch=1"
+S = "${WORKDIR}/libtool-${PV}"
+
+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}/
+	for dir in ${STAGING_DATADIR} ${STAGING_DATADIR_safe}; do
+		install -d $dir/libtool \
+			   $dir/aclocal
+		install -c config.guess $dir/libtool/config.guess
+		install -c config.sub $dir/libtool/config.sub
+		install -c -m 0644 ltmain.sh $dir/libtool/
+		install -c -m 0644 libtool.m4 $dir/aclocal/
+		install -c -m 0644 ltdl.m4 $dir/aclocal/
+	done
+}
+
+do_install () {
+}
diff --git a/libtool/libtool_1.5.6.oe b/libtool/libtool_1.5.6.oe
index e69de29bb2..9da251f862 100644
--- a/libtool/libtool_1.5.6.oe
+++ b/libtool/libtool_1.5.6.oe
@@ -0,0 +1,20 @@
+DESCRIPTION = "Generic library support script \
+This is GNU libtool, a generic library support script.  Libtool hides \
+the complexity of generating special library types (such as shared \
+libraries) behind a consistent interface."
+
+SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
+           file://${FILESDIR}/prefix.patch;patch=1 \
+           file://${FILESDIR}/autotools.patch;patch=1"
+S = "${WORKDIR}/libtool-${PV}"
+
+inherit autotools
+
+EXTRA_AUTORECONF = "--exclude=libtoolize"
+
+do_configure () {
+	find ${S} -name acinclude.m4 | for m4 in `cat`; do
+		cat ${S}/libtool.m4 ${S}/ltdl.m4 > $m4
+	done
+	autotools_do_configure
+}
diff --git a/libtool/libtool_1.5.oe b/libtool/libtool_1.5.oe
index e0599364b7..6d2092eee5 100644
--- a/libtool/libtool_1.5.oe
+++ b/libtool/libtool_1.5.oe
@@ -6,8 +6,7 @@ libraries) behind a consistent interface."
 SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
            file://${FILESDIR}/m4.patch;patch=1 \
            file://${FILESDIR}/autotools.patch;patch=1 \
-           file://${FILESDIR}/prefix.patch;patch=1 \
-           file://${FILESDIR}/libtool15-update-configscripts.patch;patch=1;pnum=1"
+           file://${FILESDIR}/prefix.patch;patch=1"
 S = "${WORKDIR}/libtool-${PV}"
 
 inherit autotools