summaryrefslogtreecommitdiffstats
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
parent3831d44240722d5f37a1ee2818e3db6db0b98750 (diff)
downloadpoky-cd93271a6672bc4f3b080320a9330a28d2383505.tar.gz
ncurses: Fix up BUILD_LDFLAGS variable corrupting builds
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-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 @@
1require ncurses_${PV}.bb 1require ncurses_${PV}.bb
2inherit native 2inherit native
3EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
4DEPENDS = "" 3DEPENDS = ""
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 @@
1require ncurses_${PV}.bb 1require ncurses_${PV}.bb
2inherit nativesdk 2inherit nativesdk
3EXTRA_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 \
32 --enable-termcap \ 32 --enable-termcap \
33 --without-cxx-binding \ 33 --without-cxx-binding \
34 --with-terminfo-dirs=${sysconfdir}/terminfo:${datadir}/terminfo \ 34 --with-terminfo-dirs=${sysconfdir}/terminfo:${datadir}/terminfo \
35 --enable-overwrite" 35 --enable-overwrite \
36 --with-build-ldflags='' \
37 --with-build-ccflags='' "
36export BUILD_CCFLAGS = "-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}" 38export BUILD_CCFLAGS = "-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}"
37export BUILD_LDFLAGS = "" 39export BUILD_LDFLAGS = ""
38export EXTRA_OEMAKE = '"BUILD_LDFLAGS=" "BUILD_CCFLAGS=${BUILD_CCFLAGS}"' 40export 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 @@
1PR = "r11" 1PR = "r14"
2 2
3SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \ 3SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
4 file://makefile_tweak.patch;patch=1 \ 4 file://makefile_tweak.patch;patch=1 \