From cd93271a6672bc4f3b080320a9330a28d2383505 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 18 Sep 2009 01:02:21 +0100 Subject: ncurses: Fix up BUILD_LDFLAGS variable corrupting builds Signed-off-by: Richard Purdie --- meta/packages/ncurses/ncurses-native_5.4.bb | 1 - meta/packages/ncurses/ncurses-nativesdk_5.4.bb | 1 - meta/packages/ncurses/ncurses.inc | 4 +++- meta/packages/ncurses/ncurses_5.4.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/packages') diff --git a/meta/packages/ncurses/ncurses-native_5.4.bb b/meta/packages/ncurses/ncurses-native_5.4.bb index 310a4bb27..e7d874995 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 646586674..835b00af2 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 b4ec69d92..afe87c596 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 8a49ba427..e69c1c067 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 \ -- cgit v1.2.3