Merge openembedded@openembedded.bkbits.net:packages

into linux.local:/home/kergoth/code/packages

2004/04/30 02:04:50-04:00 local!kergoth
Fixup ncurses-native to inherit the stock ncurses .oe.

BKrev: 4091ec8c4j6Aew-hrMN2inhTdBmTiQ

diff --git a/ncurses/ncurses-native_5.4.oe b/ncurses/ncurses-native_5.4.oe
index e69de29..07f70db 100644 (file)
--- a/ncurses/ncurses-native_5.4.oe
+++ b/ncurses/ncurses-native_5.4.oe
@@ -0,0 +1,4 @@
+include ncurses_${PV}.oe
+inherit native
+EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
+DEPENDS = ""

diff --git a/ncurses/ncurses_5.4.oe b/ncurses/ncurses_5.4.oe
index cd61587..4238d59 100644 (file)
--- a/ncurses/ncurses_5.4.oe
+++ b/ncurses/ncurses_5.4.oe
@@ -23,6 +23,7 @@ EXTRA_OECONF = "--with-shared \
                --enable-overwrite"
 export BUILD_CCFLAGS = "-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}"
 export BUILD_LDFLAGS = ""
+export EXTRA_OEMAKE = '"BUILD_LDFLAGS=" "BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
 
 do_configure_prepend () {
        if [ -e aclocal.m4 -a ! -e acinclude.m4 ]; then
@@ -36,10 +37,6 @@ do_configure () {
        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}/