ncurses: Fix up BUILD_LDFLAGS variable corrupting builds

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/ncurses/ncurses-native_5.4.bb b/meta/packages/ncurses/ncurses-native_5.4.bb
index 310a4bb27ced1b2318a36a0adc220647291409c9..e7d874995afd54c7aa16a78f19e065363cd7df8e 100644 (file)
--- 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 64658667430c9b76cec8a7c2fc01f9129472ec3e..835b00af29061a0cbcbe3c2601b143a3cc07be79 100644 (file)
--- 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 b4ec69d92ba8332b83e77dc0b1dced3606720e16..afe87c596feb1e47a4e88a05b170a458c7f24bc1 100644 (file)
--- 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 8a49ba427c9d8a57d98bb063d7acdf7e50e45a1e..e69c1c0673074fb196fd9eccb114ac51ef6cbcc3 100644 (file)
--- 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 \