BUGFIX: add staging function for ncurses, and make dropbear and zsh build.

BKrev: 3f5e214aJ9TnzKvd0sHVB6qF-CvHEg

diff --git a/content/apache-2.0.47.oe b/content/apache-2.0.47.oe
index 06510e7..74bc5c6 100644 (file)
--- a/content/apache-2.0.47.oe
+++ b/content/apache-2.0.47.oe
@@ -1,6 +1,6 @@
 SRC_URI = http://ftp.epix.net/apache/httpd/httpd-${PV}.tar.gz
 SECTION = net
-DEPENDS = virtual/libc expat pcre
+DEPENDS = virtual/libc expat pcre libtool
 RDEPENDS = libc6, libexpat1, libpcre0
 
 S = ${WORKDIR}/httpd-${PV}

diff --git a/content/dropbear-0.36.oe b/content/dropbear-0.36.oe
index b8f04ae..1d4b748 100644 (file)
--- a/content/dropbear-0.36.oe
+++ b/content/dropbear-0.36.oe
@@ -1,6 +1,14 @@
 DESCRIPTION="Dropbear SSH Implementation"
 LICENSE="MIT"
 SRC_URI="http://matt.ucc.asn.au/dropbear/dropbear-${PV}.tar.bz2"
-DEPENDS=virtual/libc base/zlib
+DEPENDS=virtual/libc zlib ncurses
 
 S="${WORKDIR}/${P}"
+
+CFLAGS_append = " -I${S}/libtomcrypt"
+LD=${CC}
+do_install () {
+       set -e
+       install -d ${D}/usr/sbin
+       oe_runmake DESTDIR=${D} install
+}

diff --git a/content/ncurses-5.3.oe b/content/ncurses-5.3.oe
index e69de29..873d13b 100644 (file)
--- a/content/ncurses-5.3.oe
+++ b/content/ncurses-5.3.oe
@@ -0,0 +1,39 @@
+DESCRIPTION="Ncurses library"
+SECTION="libs"
+DEPENDS=virtual/libc
+PV_append=.20030719
+SRC_URI=${DEBIAN_MIRROR}/main/n/ncurses/ncurses_${PV}.orig.tar.gz \
+       ${DEBIAN_MIRROR}/main/n/ncurses/ncurses_${PV}-1.diff.gz;patch=1 \
+       file://${FILESDIR}/ncurses-5.2.patch;patch=1 \
+       file://${FILESDIR}/ncurses-dirs.patch;patch=1
+
+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
+export BUILD_CC:=${BUILD_CC}
+export BUILD_CCFLAGS=-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}
+export BUILD_LDFLAGS=
+
+do_stage () {
+       install -m 0755 lib/lib*.so.* ${STAGING_LIBDIR}/
+       cp -R include/* ${STAGING_DIR}/target/include/
+       ln -sf libpanel.so.5.3 ${STAGING_LIBDIR}/libpanel.so
+       ln -sf libform.so.5.3 ${STAGING_LIBDIR}/libform.so
+       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
+}
+
+S="${WORKDIR}/${P}.orig"

diff --git a/content/zsh-4.1.1.oe b/content/zsh-4.1.1.oe
index f05ca2a..245de63 100644 (file)
--- a/content/zsh-4.1.1.oe
+++ b/content/zsh-4.1.1.oe
@@ -5,5 +5,13 @@ MAINTAINER="Chris Larson <kergoth@handhelds.org>"
 RDEPENDS="libc6"
 
 SRC_URI="http://www.zsh.org/pub/${P}.tar.bz2"
-DEPENDS=virtual/libc
+DEPENDS=virtual/libc ncurses pcre
 S="${WORKDIR}/${P}"
+
+EXTRA_OECONF = "--with-curses-terminfo"
+#EXTRA_OECONF = "--with-curses-terminfo --enable-libs='-lncurses'"
+
+do_install () {
+       set -e
+       oe_runmake DESTDIR=${D} install
+}