Another pass of .oe cleanups.

BKrev: 405f6aa92YDm0pQN4padj00WWayDrQ

2 files changed, 76 insertions, 25 deletions

diff --git a/ncurses/ncurses_5.3.oe b/ncurses/ncurses_5.3.oe
index 5d28c66053..eb60c04fb3 100644
--- a/ncurses/ncurses_5.3.oe
+++ b/ncurses/ncurses_5.3.oe
@@ -1,37 +1,36 @@
-BaseV := ${PV}
-SnapV := 20030906
+BaseV := "${PV}"
+SnapV := "20030906"
 PV = "${BaseV}.${SnapV}"
 
 DESCRIPTION = "Ncurses library"
 SECTION = "libs"
 DEPENDS = "virtual/libc"
 PROVIDES = "${PV}-${BaseV} ${PV}-${BaseV}-${PR} \
-	 ${CATEGORY}/${PN}-${BaseV} ${CATEGORY}/${PN}-${BaseV}-${PR} 
-PACKAGES_append=' ncurses-terminfo'
-FILES_ncurses_append=' ${datadir}/tabset'
+	 ${CATEGORY}/${PN}-${BaseV} ${CATEGORY}/${PN}-${BaseV}-${PR} "
+PACKAGES_append=" ncurses-terminfo"
+FILES_ncurses_append=" ${datadir}/tabset"
 FILES_ncurses-terminfo=${datadir}/terminfo
 
-SRC_URI = ${GNU_MIRROR}/ncurses/${PN}-${BaseV}.tar.gz \
-	  file://${FILESDIR}/${SnapV}.patch;patch=1 \
-	  file://${FILESDIR}/configure.patch;patch=1
-S = "${WORKDIR}/${PN}-${BaseV}"
+SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${BaseV}.tar.gz \
+	   file://${FILESDIR}/${SnapV}.patch;patch=1 \
+	   file://${FILESDIR}/configure.patch;patch=1"
+S = "${WORKDIR}/ncurses-${BaseV}"
 
 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=${sysconfdir}/terminfo:${datadir}/terminfo \
-	     --enable-overwrite
-export BUILD_CC := ${BUILD_CC}
-export BUILD_CCFLAGS=-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}
-export BUILD_LDFLAGS=
+EXTRA_OECONF = "--with-shared \
+	        --without-profile \
+	        --without-debug \
+	        --disable-rpath \
+	        --enable-echo \
+	        --enable-const \
+	        --without-ada \
+	        --enable-termcap \
+	        --without-cxx-binding \
+	        --with-terminfo-dirs=${sysconfdir}/terminfo:${datadir}/terminfo \
+	        --enable-overwrite"
+export BUILD_CCFLAGS = "-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}"
+export BUILD_LDFLAGS =
 
 do_configure_prepend () {
 	if [ -e aclocal.m4 -a ! -e acinclude.m4 ]; then
@@ -53,9 +52,9 @@ do_stage () {
 	install -m 0755 lib/lib*.so.* ${STAGING_LIBDIR}/
 	for h in ncurses_*.h curses.h eti.h form.h menu.h panel.h \
 		termcap.h term.h unctrl.h; do
-		       install -m 0644 include/$h ${STAGING_DIR}/target/include/
+		       install -m 0644 include/$h ${STAGING_INCDIR}/
 	done
-	ln -sf curses.h ${STAGING_DIR}/target/include/ncurses.h
+	ln -sf curses.h ${STAGING_INCDIR}/ncurses.h
 	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
diff --git a/ncurses/ncurses_5.4.oe b/ncurses/ncurses_5.4.oe
index e69de29bb2..0a80cc265e 100644
--- a/ncurses/ncurses_5.4.oe
+++ b/ncurses/ncurses_5.4.oe
@@ -0,0 +1,52 @@
+DESCRIPTION = "Ncurses library"
+SECTION = "libs"
+DEPENDS = "virtual/libc"
+PACKAGES_append = " ncurses-terminfo"
+FILES_ncurses_append = " ${datadir}/tabset"
+FILES_ncurses-terminfo = "${datadir}/terminfo"
+
+SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz"
+S = "${WORKDIR}/ncurses-${PV}"
+
+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=${sysconfdir}/terminfo:${datadir}/terminfo \
+	        --enable-overwrite"
+export BUILD_CCFLAGS = "-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}"
+export BUILD_LDFLAGS =
+
+do_configure_prepend () {
+	if [ -e aclocal.m4 -a ! -e acinclude.m4 ]; then
+		cat aclocal.m4 > acinclude.m4
+	fi
+}
+
+do_configure () {
+# override this function to avoid the autoconf/automake/aclocal/autoheader
+# calls for now
+	oe_runconf
+}
+
+do_compile () {
+	oe_runmake BUILD_LDFLAGS="" 'BUILD_CCFLAGS=${BUILD_CCFLAGS}'
+}
+
+do_stage () {
+	for i in ncurses panel form menu; do
+		oe_soinstall lib/lib$i.so.${PV} ${STAGING_LIBDIR}/
+	done
+	for h in ncurses_*.h curses.h eti.h form.h menu.h panel.h \
+		termcap.h term.h unctrl.h; do
+		       install -m 0644 include/$h ${STAGING_INCDIR}/
+	done
+	ln -sf curses.h ${STAGING_INCDIR}/ncurses.h
+}