[oe-commits] Ben Shelton : mg: fix build when host system does not have libncurses-dev

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: c40c3b4fda4872ee1bff0178e088313a97c99e31
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=c40c3b4fda4872ee1bff0178e088313a97c99e31

Author: Ben Shelton <ben.shelton at ni.com>
Date:   Fri Aug 15 10:09:03 2014 -0500

mg: fix build when host system does not have libncurses-dev

The configure script for mg checks the standard locations under /usr for
the term.h header file needed to build against ncurses; however, in the
OE cross-compile case, this is not valid, since the file will be under
the sysroot instead.  This causes the configure step to fail when the
build machine does not have the libncurses-dev package installed.

To fix the issue, remove the check.  Since mg DEPENDS on ncurses, term.h
will always be there.

Signed-off-by: Ben Shelton <ben.shelton at ni.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../mg/files/remove_ncurses_check.patch            | 36 ++++++++++++++++++++++
 meta-oe/recipes-support/mg/mg_20110905.bb          |  3 +-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/mg/files/remove_ncurses_check.patch b/meta-oe/recipes-support/mg/files/remove_ncurses_check.patch
new file mode 100644
index 0000000..16137da
--- /dev/null
+++ b/meta-oe/recipes-support/mg/files/remove_ncurses_check.patch
@@ -0,0 +1,36 @@
+diff -uwr mg-20110905/configure mg-20110905-changed/configure
+--- mg-20110905/configure	2011-09-05 13:36:16.000000000 -0500
++++ mg-20110905-changed/configure	2014-08-14 10:46:14.168715425 -0500
+@@ -163,32 +163,6 @@
+     echo 'Fails.'
+ fi
+ 
+-
+-if [ ! -r /usr/include/term.h ]; then
+-    note 'term.h'
+-    if [ -r /usr/include/ncurses/term.h ]; then
+-	echo "Found in /usr/include/ncurses"
+-	extraflags="$extraflags -I/usr/include/ncurses"
+-    else
+-	for i in pkg local; do
+-	    if [ -r /usr/$i/include/term.h ]; then
+-		echo "Found in /usr/$i/include"
+-		extralibs="$extralibs -L/usr/$i/lib"
+-		extraflags="$extraflags -I/usr/$i/include"
+-		break
+-	    else
+-		false
+-	    fi
+-	done ||
+-	{
+-	    echo 'Not found!' >&2
+-	    echo 'Do you have the ncurses devel package installed?' >&2
+-	    echo 'If you know where term.h is, please email the author!' >&2
+-	    exit 1
+-	}
+-    fi
+-fi
+-
+ note 'base and dirname'
+ if gcc_defines "__GLIBC__" || gcc_defines "__CYGWIN__" ; then
+     echo 'Not present, adding.'
diff --git a/meta-oe/recipes-support/mg/mg_20110905.bb b/meta-oe/recipes-support/mg/mg_20110905.bb
index 33cc038..b9a4d33 100644
--- a/meta-oe/recipes-support/mg/mg_20110905.bb
+++ b/meta-oe/recipes-support/mg/mg_20110905.bb
@@ -5,7 +5,8 @@ LIC_FILES_CHKSUM = "file://version.c;md5=811e1b67a5cd60c12b218a2b7c1adbf2"
 DEPENDS = "ncurses"
 SECTION = "console/editors"
 
-SRC_URI = "http://homepage.boetes.org/software/mg/mg-${PV}.tar.gz"
+SRC_URI = "http://homepage.boetes.org/software/mg/mg-${PV}.tar.gz \
+           file://remove_ncurses_check.patch"
 
 SRC_URI[md5sum] = "2de35316fa8ebafe6003efaae70b723e"
 SRC_URI[sha256sum] = "1cd37d7e6a3eecc890a5718c38b8f38495057ba93856762a756ccee2f9618229"