Libtool updates.. add 'inherit libtool' where necessary, and fix a bug that was breaking our busybox configs.

BKrev: 3f749da4vO8IAr8t_7pqHYdiiKOyTw

15 files changed, 52 insertions, 20 deletions

diff --git a/content/apache-2.0.47.oe b/content/apache-2.0.47.oe
index 6c75bcabc7..b46e854e56 100644
--- a/content/apache-2.0.47.oe
+++ b/content/apache-2.0.47.oe
@@ -1,11 +1,11 @@
 SRC_URI = http://ftp.epix.net/apache/httpd/httpd-${PV}.tar.gz
 SECTION = net
-DEPENDS = virtual/libc expat libtool openssl
+DEPENDS = virtual/libc expat openssl
 RDEPENDS = libc6, libexpat1, libssl0.9.7
 
 S = ${WORKDIR}/httpd-${PV}
 
-inherit autotools
+inherit autotools libtool
 
 CFLAGS_append = " -DPATH_MAX=4096"
 CFLAGS_prepend = "-I${STAGING_DIR}/target/include/openssl "
diff --git a/content/busybox-1.00-pre2.oe b/content/busybox-1.00-pre2.oe
index 9e2848fe1e..252d6fefbb 100644
--- a/content/busybox-1.00-pre2.oe
+++ b/content/busybox-1.00-pre2.oe
@@ -15,6 +15,8 @@ S="${WORKDIR}/${P}"
 export EXTRA_CFLAGS="${CFLAGS}"
 EXTRA_OEMAKE_append=' CROSS=${CROSS}'
 
+inherit cml1
+
 do_configure () {
 	install -m 0644 ${FILESDIR}/defconfig ${S}/.config
 	cml1_do_configure
@@ -37,5 +39,3 @@ do_package_ipk_prepend () {
 	install -m 0755 ${FILESDIR}/postinst ${D}/CONTROL/postinst;
 	install -m 0755 ${FILESDIR}/prerm ${D}/CONTROL/prerm;
 }
-
-inherit cml1 base
diff --git a/content/busybox-1.00-pre3.oe b/content/busybox-1.00-pre3.oe
index 4ca16bf5a3..7ceb2c4631 100644
--- a/content/busybox-1.00-pre3.oe
+++ b/content/busybox-1.00-pre3.oe
@@ -15,6 +15,8 @@ S="${WORKDIR}/${P}"
 export EXTRA_CFLAGS="${CFLAGS}"
 EXTRA_OEMAKE_append=' CROSS=${CROSS}'
 
+inherit cml1
+
 do_configure () {
 	install -m 0644 ${FILESDIR}/defconfig ${S}/.config
 	cml1_do_configure
@@ -36,5 +38,3 @@ do_package_ipk_prepend () {
 	install -m 0755 ${FILESDIR}/postinst ${D}/CONTROL/postinst;
 	install -m 0755 ${FILESDIR}/prerm ${D}/CONTROL/prerm;
 }
-
-inherit cml1 base
diff --git a/content/expat-1.95.6.oe b/content/expat-1.95.6.oe
index fca7bb5147..638ff75291 100644
--- a/content/expat-1.95.6.oe
+++ b/content/expat-1.95.6.oe
@@ -5,7 +5,7 @@ RDEPENDS = libc6
 SRC_URI = ${SOURCEFORGE_MIRROR}/${PN}/${P}.tar.gz
 S = "${WORKDIR}/${P}"
 
-inherit autotools
+inherit autotools libtool
 
 do_stage () {
 	install -m 0644 lib/expat.h ${STAGING_DIR}/target/include/
diff --git a/content/fakeroot-0.7.5.oe b/content/fakeroot-0.7.5.oe
index f031a529ad..fad2bcdd95 100644
--- a/content/fakeroot-0.7.5.oe
+++ b/content/fakeroot-0.7.5.oe
@@ -1,4 +1,4 @@
 SRC_URI := ${DEBIAN_MIRROR}/main/f/fakeroot/${PN}_${PV}.tar.gz
 S = ${WORKDIR}/${P}
 
-inherit autotools
+inherit autotools libtool
diff --git a/content/ifupdown-0.6.4.oe b/content/ifupdown-0.6.4.oe
index 2f30b27565..0c1bcaedd0 100644
--- a/content/ifupdown-0.6.4.oe
+++ b/content/ifupdown-0.6.4.oe
@@ -23,6 +23,6 @@ do_install () {
 		   ${D}/sbin
 	install -m 0755 ifup ${D}/sbin/
 	ln ${D}/sbin/ifup ${D}/sbin/ifdown
-	install -m 0644 ${FILESDIR}/init ${D}/etc/init.d/init
+	install -m 0644 ${FILESDIR}/init ${D}/etc/init.d/networking
 	install -m 0644 ${FILESDIR}/interfaces ${D}/etc/network/interfaces
 }
diff --git a/content/irda-utils-0.9.15.oe b/content/irda-utils-0.9.15.oe
index be32043981..e81638a803 100644
--- a/content/irda-utils-0.9.15.oe
+++ b/content/irda-utils-0.9.15.oe
@@ -7,7 +7,7 @@ DESCRIPTION = Provides common files needed to use IrDA.\
 SRC_URI = ${SOURCEFORGE_MIRROR}/irda/${P}.tar.gz
 S = ${WORKDIR}/${P}
 
-inherit autotools
+inherit autotools libtool
 
 do_compile () {
 	oe_runmake -C irattach
diff --git a/content/jpeg-6b.oe b/content/jpeg-6b.oe
index e40aaa00e0..0c900a3186 100644
--- a/content/jpeg-6b.oe
+++ b/content/jpeg-6b.oe
@@ -8,12 +8,10 @@ SRC_URI = http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
 	  file://${FILESDIR}/debian.patch;patch=1
 S=${WORKDIR}/jpeg-${PV}
 
-inherit autotools
+inherit autotools libtool
 
 EXTRA_OECONF="--enable-static --enable-shared"
 
-# this libtool cant handle the multiword gcc
-CC:=${@oe.data.getVar("CC", d, 1).split()[-1].strip()}
 CFLAGS_append = " -D_REENTRANT"
 #export AR:=${AR} rv
 
diff --git a/content/libogg-1.0.0.oe b/content/libogg-1.0.0.oe
index 45a6e30a46..58ea5406bb 100644
--- a/content/libogg-1.0.0.oe
+++ b/content/libogg-1.0.0.oe
@@ -9,4 +9,4 @@ SRC_URI = "ftp://ftp.debian.org/debian/pool/main/libo/libogg/${PN}_${PV}.orig.ta
 SRC_URI_append = " file://${FILESDIR}/libogg-configure.patch;patch=1"
 S=${WORKDIR}/${P}
 
-inherit autotools
+inherit autotools libtool
diff --git a/content/libtool-1.5.oe b/content/libtool-1.5.oe
index e69de29bb2..8d9d8c4b21 100644
--- a/content/libtool-1.5.oe
+++ b/content/libtool-1.5.oe
@@ -0,0 +1,36 @@
+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.  To use libtool, add the\
+ new generic library building commands to your Makefile, Makefile.in,\
+ or Makefile.am.  See the documentation for details.  Libtool supports\
+ building static libraries on all platforms.\
+ Libtool supports generation of C, C++ and Java libraries.
+
+SRC_URI = http://ftp.club.cc.cmu.edu/pub/gnu/libtool/libtool-1.5.tar.gz \
+	  file://${FILESDIR}/libdir-la.patch;patch=1 \
+	  file://${FILESDIR}/sedvar.patch;patch=1 \
+	  file://${FILESDIR}/tag.patch;patch=1 \
+	  file://${FILESDIR}/libtoolize-staging.patch;patch=1
+#	  file://${FILESDIR}/libdir-rpath.patch;patch=1
+S = "${WORKDIR}/${P}"
+
+inherit autotools
+
+EXTRA_OECONF = --disable-ltdl-install
+do_configure_prepend () {
+	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC CPP
+	./bootstrap
+	rm -f ${S}/ltmain.sh
+}
+
+do_stage () {
+	install -d ${STAGING_DIR}/share/{libtool,aclocal}
+	install -m 0755 libtool ${STAGING_BINDIR}/libtool
+	install -m 0755 libtoolize ${STAGING_BINDIR}/libtoolize
+	install -c config.guess ${STAGING_DIR}/share/libtool/
+	install -c config.sub ${STAGING_DIR}/share/libtool/
+	install -c -m 0644 ltmain.sh ${STAGING_DIR}/share/libtool/
+	install -c -m 0644 libtool.m4 ${STAGING_DIR}/share/aclocal/
+	install -c -m 0644 ltdl.m4 ${STAGING_DIR}/share/aclocal/
+}
diff --git a/content/libtool-1.5/libdir.patch b/content/libtool-1.5/libdir-la.patch
index e69de29bb2..e69de29bb2 100644
--- a/content/libtool-1.5/libdir.patch
+++ b/content/libtool-1.5/libdir-la.patch
diff --git a/content/openobex-1.0.0.oe b/content/openobex-1.0.0.oe
index e9f11c84cd..f35d493129 100644
--- a/content/openobex-1.0.0.oe
+++ b/content/openobex-1.0.0.oe
@@ -4,7 +4,7 @@ RDEPENDS = libc6
 SRC_URI = ${SOURCEFORGE_MIRROR}/openobex/${P}.tar.gz
 S = ${WORKDIR}/${P}
 
-inherit autotools
+inherit autotools libtool
 
 do_stage () {
 	install -m 0755 src/.libs/libopenobex* ${STAGING_LIBDIR}/
diff --git a/content/openobex-apps-1.0.0.oe b/content/openobex-apps-1.0.0.oe
index bb5b8e3402..bac16557f1 100644
--- a/content/openobex-apps-1.0.0.oe
+++ b/content/openobex-apps-1.0.0.oe
@@ -4,7 +4,7 @@ RDEPENDS = libc6 libopenobex1
 SRC_URI = ${SOURCEFORGE_MIRROR}/openobex/${P}.tar.gz
 S = ${WORKDIR}/${P}
 
-inherit autotools
+inherit autotools libtool
 
 EXTRA_OECONF = --disable-glibtest --with-glib-prefix=${STAGING_DIR}/target
 export OPENOBEX_CFLAGS=-I${STAGING_DIR}/target/include
diff --git a/content/pcre-4.4.oe b/content/pcre-4.4.oe
index 27e1ebce6e..36e0113380 100644
--- a/content/pcre-4.4.oe
+++ b/content/pcre-4.4.oe
@@ -11,10 +11,8 @@ the POSIX-style functions is called pcreposix.h.
 SRC_URI = ftp://ftp.csx.cam.ac.uk/pub/software/programming/${PN}/${P}.tar.bz2
 S = "${WORKDIR}/${P}"
 
-inherit autotools
+inherit autotools libtool
 
-# this libtool cant handle the multiword gcc
-CC:=${@oe.data.getVar("CC", d, 1).split()[-1].strip()}
 CFLAGS_append = " -D_REENTRANT"
 do_compile () {
 	${BUILD_CC} -I${S}/include -c dftables.c
diff --git a/content/tslib.oe b/content/tslib.oe
index 5abd5cc5e5..95edbc163b 100644
--- a/content/tslib.oe
+++ b/content/tslib.oe
@@ -10,7 +10,7 @@ SRC_URI_append = " file://${FILESDIR}/envvar_doc.patch;patch=1"
 #SRC_URI_append = " file://${FILESDIR}/collie-module.patch;patch=1"
 S = ${WORKDIR}/${PN}
 
-inherit autotools
+inherit autotools libtool
 
 do_compile_prepend () {
 	./autogen.sh