9 files changed, 90 insertions, 41 deletions
diff --git a/content/apache-2.0.47.oe b/content/apache-2.0.47.oe
index 00cb4667ab..6c75bcabc7 100644
--- a/content/apache-2.0.47.oe
+++ b/content/apache-2.0.47.oe
@@ -5,12 +5,12 @@ RDEPENDS = libc6, libexpat1, libssl0.9.7
 
 S = ${WORKDIR}/httpd-${PV}
 
+inherit autotools
+
 CFLAGS_append = " -DPATH_MAX=4096"
 CFLAGS_prepend = "-I${STAGING_DIR}/target/include/openssl "
 EXTRA_OECONF = --enable-ssl --with-ssl=${STAGING_DIR}/target --enable-dav --enable-dav-fs
 do_compile () {
-	set -e
-	oe_runconf
 	touch srclib/apr-util/uri/gen_uri_delims.lo
 	${BUILD_CC} srclib/apr-util/uri/gen_uri_delims.c -o srclib/apr-util/uri/gen_uri_delims
 	touch srclib/pcre/dftables.lo
@@ -25,10 +25,3 @@ do_compile () {
 	cd ..
 	oe_runmake
 }
-
-do_install () {
-	set -e
-	oe_runmake DESTDIR="${D}" install
-}
-
-inherit base
diff --git a/content/diffutils-2.8.1.oe b/content/diffutils-2.8.1.oe
index 6009464b7e..ec577a2c0f 100644
--- a/content/diffutils-2.8.1.oe
+++ b/content/diffutils-2.8.1.oe
@@ -4,9 +4,6 @@ RDEPENDS = libc6
 SRC_URI = ${GNU_MIRROR}/${PN}/${P}.tar.gz
 S = ${WORKDIR}/${P}
 
-EXTRA_OEMAKE = 
+inherit autotools
 
-do_install () {
-	set -e
-	oe_runmake DESTDIR="${D}" install
-}
+EXTRA_OEMAKE = 
diff --git a/content/glibc-2.3.2.oe b/content/glibc-2.3.2.oe
index 9176a58987..8bbd3330e3 100644
--- a/content/glibc-2.3.2.oe
+++ b/content/glibc-2.3.2.oe
@@ -67,13 +67,12 @@ PROVIDES=virtual/libc
 
 S="${WORKDIR}/${P}"
 builddir="${WORKDIR}/build-${SYS}"
+
+inherit autotools
+
 EXTRA_OECONF="--with-elf --disable-profile --enable-add-ons=linuxthreads --with-elf --enable-shared --with-headers=${WORKDIR}/linux/include --without-cvs --enable-kernel=2.4.6"
 EXTRA_OEMAKE=
 
-PACKAGES="libc6"
-FILES=
-FILES_libc6="*"
-
 glibcbuild_do_unpack () {
 	mv "${WORKDIR}/linuxthreads" "${WORKDIR}/linuxthreads_db" "${S}/"
 # kernel headers
@@ -87,7 +86,6 @@ python do_unpack () {
 }
 
 do_compile() {
-	oenote "pwd is `/bin/pwd`"
 	touch sysdeps/${ARCH}/framestate.c
 	mkdir -p "${builddir}"
 	cd "${builddir}"
diff --git a/content/libtool-1.4.3.oe b/content/libtool-1.4.3.oe
index 37ca2e6535..52643ab6b3 100644
--- a/content/libtool-1.4.3.oe
+++ b/content/libtool-1.4.3.oe
@@ -18,13 +18,13 @@ SRC_URI = ${DEBIAN_MIRROR}/main/libt/${PN}/${PN}_${PV}.orig.tar.gz \
 	  file://${FILESDIR}/libtoolize-staging.patch;patch=1
 S = "${WORKDIR}/${P}"
 
+inherit autotools
+
 EXTRA_OECONF = --disable-ltdl-install
 EXTRA_OEMAKE =
-do_compile () {
-	set -e
+do_configure_prepend () {
 	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS CC CPP
 	./bootstrap
-	oe_runconf
 }
 
 do_stage () {
@@ -37,8 +37,3 @@ do_stage () {
 	install -c -m 0644 libtool.m4 ${STAGING_DIR}/share/aclocal/
 	install -c -m 0644 ltdl.m4 ${STAGING_DIR}/share/aclocal/
 }
-
-do_install () {
-	EXTRA_OEMAKE=""
-	oe_runmake DESTDIR=${D} install
-}
diff --git a/content/ncurses-4.2.oe b/content/ncurses-4.2.oe
index e69de29bb2..b2821dfb8e 100644
--- a/content/ncurses-4.2.oe
+++ b/content/ncurses-4.2.oe
@@ -0,0 +1,42 @@
+DESCRIPTION="Ncurses library"
+SECTION="libs"
+DEPENDS=virtual/libc
+SRC_URI = ${GNU_MIRROR}/ncurses/${P}.tar.gz \
+	  file://${FILESDIR}/mk_shared_lib.patch;patch=1 \
+	  file://${FILESDIR}/run_tic.patch;patch=1
+S = ${WORKDIR}/${P}
+
+inherit autotools
+
+EXTRA_OECONF=--with-shared \
+	     --without-profile \
+	     --without-debug \
+	     --disable-rpath \
+	     --enable-echo \
+	     --enable-const \
+	     --without-ada \
+	     --enable-termcap \
+	     --without-cxx-binding \
+	     --with-terminfo-dirs=/etc/terminfo:/usr/share/terminfo \
+	     --enable-overwrite
+EXTRA_OEMAKE = 
+export HOSTCCFLAGS=-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}
+export HOSTLDFLAGS=
+export LD := ${CC}
+
+do_compile () {
+	oe_runmake -C progs 'HOSTCC=${BUILD_CC}' 'HOSTLDFLAGS=' \
+		   'HOSTCCFLAGS=${HOSTCCFLAGS}' 'CC=${BUILD_CC}' \
+		   'LINK=${BUILD_CXX}' 'CFLAGS=${HOSTCCFLAGS}' \
+		   'LDFLAGS=-lncurses' tic
+	oe_runmake 'HOSTCC=${HOSTCC}' 'HOSTLDFLAGS=' 'HOSTCCFLAGS=${HOSTCCFLAGS}'
+}
+
+do_stage () {
+	install -m 0755 lib/lib*.so.* ${STAGING_LIBDIR}/
+	cp -R include/* ${STAGING_DIR}/target/include/
+	ln -sf libpanel.so.${PV} ${STAGING_LIBDIR}/libpanel.so
+	ln -sf libform.so.${PV} ${STAGING_LIBDIR}/libform.so
+	ln -sf libmenu.so.${PV} ${STAGING_LIBDIR}/libmenu.so
+	ln -sf libncurses.so.${PV} ${STAGING_LIBDIR}/libncurses.so
+}
diff --git a/content/ncurses-5.3.oe b/content/ncurses-5.3.oe
index c67a343c0f..1057a25706 100644
--- a/content/ncurses-5.3.oe
+++ b/content/ncurses-5.3.oe
@@ -8,6 +8,8 @@ SRC_URI = ${GNU_MIRROR}/ncurses/${PN}-${BaseV}.tar.gz \
 	  file://${FILESDIR}/${SnapV}.patch;patch=1
 S = ${WORKDIR}/${PN}-${BaseV}
 
+inherit autotools
+
 EXTRA_OECONF=--with-shared \
 	     --without-profile \
 	     --without-debug \
@@ -25,8 +27,6 @@ export BUILD_CCFLAGS=-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}
 export BUILD_LDFLAGS=
 
 do_compile () {
-	set -e
-	oe_runconf
 	oe_runmake BUILD_LDFLAGS="" 'BUILD_CCFLAGS=${BUILD_CCFLAGS}'
 }
 
@@ -38,8 +38,3 @@ do_stage () {
 	ln -sf libmenu.so.5.3 ${STAGING_LIBDIR}/libmenu.so
 	ln -sf libncurses.so.5.3 ${STAGING_LIBDIR}/libncurses.so
 }
-
-do_install () {
-	set -e
-	oe_runmake DESTDIR=${D} install
-}
diff --git a/content/openobex-1.0.0.oe b/content/openobex-1.0.0.oe
index e69de29bb2..00a3bba5cb 100644
--- a/content/openobex-1.0.0.oe
+++ b/content/openobex-1.0.0.oe
@@ -0,0 +1,16 @@
+DEPENDS = virtual/libc
+RDEPENDS = libc6
+
+SRC_URI = ${SOURCEFORGE_MIRROR}/openobex/${P}.tar.gz
+S = ${WORKDIR}/${P}
+
+inherit autotools
+
+EXTRA_OEMAKE =
+
+do_stage () {
+	install -m 0755 src/.libs/libopenobex* ${STAGING_LIBDIR}/
+	install -d ${STAGING_DIR}/target/include/openobex
+	install -m 0644 src/obex_const.h src/obex.h ${STAGING_DIR}/target/include/openobex/
+	install -m 0755 openobex-config ${STAGING_BINDIR}/
+}
diff --git a/content/openobex-apps-1.0.0.oe b/content/openobex-apps-1.0.0.oe
index e69de29bb2..cf66f11402 100644
--- a/content/openobex-apps-1.0.0.oe
+++ b/content/openobex-apps-1.0.0.oe
@@ -0,0 +1,18 @@
+DEPENDS = virtual/libc openobex
+RDEPENDS = libc6 libopenobex1
+
+SRC_URI = ${SOURCEFORGE_MIRROR}/openobex/${P}.tar.gz
+S = ${WORKDIR}/${P}
+
+inherit autotools
+
+EXTRA_OEMAKE =
+EXTRA_OECONF = --disable-glibtest --with-glib-prefix=${STAGING_DIR}/target
+export OPENOBEX_CFLAGS=-I${STAGING_DIR}/target/include
+export OPENOBEX_CONFIG = ${STAGING_BINDIR}/openobex-config \
+			 --prefix=${STAGING_DIR}/target \
+			 --exec-prefix=${STAGING_DIR}/target
+
+do_compile () {
+	oe_runmake 'INCLUDES='
+}
diff --git a/content/pcre-4.4.oe b/content/pcre-4.4.oe
index d0c02bb3df..529465152e 100644
--- a/content/pcre-4.4.oe
+++ b/content/pcre-4.4.oe
@@ -11,12 +11,12 @@ 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
+
 # this libtool cant handle the multiword gcc
 CC:=${@oe.data.getVar("CC", d, 1).split()[-1].strip()}
 CFLAGS_append = " -D_REENTRANT"
 do_compile () {
-	set -e
-	oe_runconf
 	${BUILD_CC} -I${S}/include -c dftables.c
 	${BUILD_CC} dftables.o -o dftables
 	oe_runmake
@@ -36,8 +36,3 @@ do_stage () {
 	install -m 0644 pcre.h ${STAGING_DIR}/target/include/
 	install -m 0644 pcreposix.h ${STAGING_DIR}/target/include/
 }
-
-do_install () {
-	set -e
-	oe_runmake 'DESTDIR=${D}' install
-}