diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-04-30 06:05:00 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-04-30 06:05:00 +0000 |
| commit | d2da93c799eaaed222127e67ed2d6e3527969b63 (patch) | |
| tree | df9101235aa67d792b38dde6c5a869ac4992f352 /ncurses | |
| parent | 6f701e0c6d8c8c6f014853ef9b47c8ea9c8e9102 (diff) | |
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
Diffstat (limited to 'ncurses')
| -rw-r--r-- | ncurses/ncurses-native_5.4.oe | 4 | ||||
| -rw-r--r-- | ncurses/ncurses_5.4.oe | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ncurses/ncurses-native_5.4.oe b/ncurses/ncurses-native_5.4.oe index e69de29bb2..07f70db47e 100644 --- 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 cd615875b8..4238d59e92 100644 --- 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}/ |