summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-09-18 01:02:21 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-09-18 01:02:21 +0100
commitcd93271a6672bc4f3b080320a9330a28d2383505 (patch)
tree92c87c3f806c7aee3227c0f66330cbdea5423208 /meta
parent3831d44240722d5f37a1ee2818e3db6db0b98750 (diff)
downloadopenembedded-core-cd93271a6672bc4f3b080320a9330a28d2383505.tar.gz
openembedded-core-cd93271a6672bc4f3b080320a9330a28d2383505.tar.bz2
openembedded-core-cd93271a6672bc4f3b080320a9330a28d2383505.zip
ncurses: Fix up BUILD_LDFLAGS variable corrupting builds
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/ncurses/ncurses-native_5.4.bb1
-rw-r--r--meta/packages/ncurses/ncurses-nativesdk_5.4.bb1
-rw-r--r--meta/packages/ncurses/ncurses.inc4
-rw-r--r--meta/packages/ncurses/ncurses_5.4.bb2
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/packages/ncurses/ncurses-native_5.4.bb b/meta/packages/ncurses/ncurses-native_5.4.bb
index 310a4bb27c..e7d874995a 100644
--- a/meta/packages/ncurses/ncurses-native_5.4.bb
+++ b/meta/packages/ncurses/ncurses-native_5.4.bb
@@ -1,4 +1,3 @@
require ncurses_${PV}.bb
inherit native
-EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
DEPENDS = ""
diff --git a/meta/packages/ncurses/ncurses-nativesdk_5.4.bb b/meta/packages/ncurses/ncurses-nativesdk_5.4.bb
index 6465866743..835b00af29 100644
--- a/meta/packages/ncurses/ncurses-nativesdk_5.4.bb
+++ b/meta/packages/ncurses/ncurses-nativesdk_5.4.bb
@@ -1,3 +1,2 @@
require ncurses_${PV}.bb
inherit nativesdk
-EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
diff --git a/meta/packages/ncurses/ncurses.inc b/meta/packages/ncurses/ncurses.inc
index b4ec69d92b..afe87c596f 100644
--- a/meta/packages/ncurses/ncurses.inc
+++ b/meta/packages/ncurses/ncurses.inc
@@ -32,7 +32,9 @@ EXTRA_OECONF = "--with-shared \
--enable-termcap \
--without-cxx-binding \
--with-terminfo-dirs=${sysconfdir}/terminfo:${datadir}/terminfo \
- --enable-overwrite"
+ --enable-overwrite \
+ --with-build-ldflags='' \
+ --with-build-ccflags='' "
export BUILD_CCFLAGS = "-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}"
export BUILD_LDFLAGS = ""
export EXTRA_OEMAKE = '"BUILD_LDFLAGS=" "BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
diff --git a/meta/packages/ncurses/ncurses_5.4.bb b/meta/packages/ncurses/ncurses_5.4.bb
index 8a49ba427c..e69c1c0673 100644
--- a/meta/packages/ncurses/ncurses_5.4.bb
+++ b/meta/packages/ncurses/ncurses_5.4.bb
@@ -1,4 +1,4 @@
-PR = "r11"
+PR = "r14"
SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
file://makefile_tweak.patch;patch=1 \