diff options
| author |   Roy Li <rongqing.li@windriver.com> | 2014-06-19 17:20:23 +0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-21 12:20:20 +0200 |
| commit | 52b21a1951fc21ae1ae85440fcf6da04ad3258ea (patch) | |
| tree | 637845cbffc9342f2eddc87ad027bb5351a31aee /meta-oe/recipes-extended/dialog | |
| parent | cc15a4fd24e461f622f5d3aa47da1792390468d2 (diff) | |
| download | meta-openembedded-contrib-52b21a1951fc21ae1ae85440fcf6da04ad3258ea.tar.gz | |
dialog: inherit brokensep and use pkg-config to detect ncurses
1. inherit autotools-brokensep, or else configuration will fail since B!=S
2. use pkg-config to detect ncurses, since ncurses-config no longer works
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/dialog')
| -rw-r--r-- | meta-oe/recipes-extended/dialog/dialog.inc | 6 | ||||
| -rw-r--r-- | meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch | 40 |
2 files changed, 44 insertions, 2 deletions
diff --git a/meta-oe/recipes-extended/dialog/dialog.inc b/meta-oe/recipes-extended/dialog/dialog.inc index c1c28fd876..995d6c07c1 100644 --- a/meta-oe/recipes-extended/dialog/dialog.inc +++ b/meta-oe/recipes-extended/dialog/dialog.inc @@ -8,12 +8,14 @@ DEPENDS = "ncurses" LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" -SRC_URI = "ftp://invisible-island.net/dialog/dialog-${PV}.tgz" +SRC_URI = "ftp://invisible-island.net/dialog/dialog-${PV}.tgz \ + file://use-pkg-config-for-ncurses-detection.patch \ + " # hardcoded here for use in dialog-static recipe S = "${WORKDIR}/dialog-${PV}" -inherit autotools +inherit autotools-brokensep pkgconfig EXTRA_OECONF = "--with-ncurses \ --disable-rpath-hack" diff --git a/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch b/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch new file mode 100644 index 0000000000..b5b4b3c3cf --- /dev/null +++ b/meta-oe/recipes-extended/dialog/files/use-pkg-config-for-ncurses-detection.patch @@ -0,0 +1,40 @@ +Subject: [PATCH] use pkg-config for ncurses detection. + +Upstream-Status: Inappropriate [configuration] + +This is a workaround to make dialog be able to build after ncurses-config +does not work, since the configure file is called directly in dialog bb +file, and autoconf can not work, make a workaround in configure file. + +Signed-off-by: Roy Li <rongqing.li@windriver.com> +--- + configure | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure b/configure +index 24e28c1..c78735d 100755 +--- a/configure ++++ b/configure +@@ -9976,8 +9976,8 @@ fi + + if test "$NCURSES_CONFIG" != none ; then + +-CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`" +-LIBS="`$NCURSES_CONFIG --libs` $LIBS" ++CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "ncurses" 2>&1`" ++LIBS="`pkg-config --short-errors --print-errors --libs "ncurses" 2>&1` $LIBS" + + # even with config script, some packages use no-override for curses.h + +@@ -10096,7 +10096,7 @@ cat >>confdefs.h <<EOF + #define $cf_nculib_ROOT 1 + EOF + +-cf_cv_ncurses_version=`$NCURSES_CONFIG --version` ++cf_cv_ncurses_version=`pkg-config --short-errors --print-errors --modversion "ncurses"` + + else + +-- +1.7.10.4 + |