From d2da93c799eaaed222127e67ed2d6e3527969b63 Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Fri, 30 Apr 2004 06:05:00 +0000
Subject: 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
---
ncurses/ncurses-native_5.4.oe | 4 ++++
ncurses/ncurses_5.4.oe | 5 +----
2 files changed, 5 insertions(+), 4 deletions(-)
(limited to 'ncurses')
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}/
--
cgit v1.2.3