Patchwork gettext: Make ncurses dependency conditional on PACKAGECONFIG[msgcat-curses]

login
register
mail settings
Submitter Phil Blundell
Date April 25, 2013, 1:03 p.m.
Message ID <1366895033.14512.89.camel@phil-desktop.brightsign>
Download mbox | patch
Permalink /patch/48889/
State Accepted
Commit b48db72ee7cd608d3d4598bc54f1b05bbc698d94
Headers show

Comments

Phil Blundell - April 25, 2013, 1:03 p.m.
According to the documentation, the only reason for needing ncurses is
to support colour output from msgcat.  Make this optional so that
ncurses doesn't need to be built if colour output is not required.

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/recipes-core/gettext/gettext_0.18.2.bb |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-core/gettext/gettext_0.18.2.bb b/meta/recipes-core/gettext/gettext_0.18.2.bb
index 086f7fa..7b4cc25 100644
--- a/meta/recipes-core/gettext/gettext_0.18.2.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.2.bb
@@ -6,7 +6,7 @@  LICENSE = "GPLv3+ & LGPL-2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 PR = "r0"
-DEPENDS = "gettext-native virtual/libiconv ncurses expat"
+DEPENDS = "gettext-native virtual/libiconv expat"
 DEPENDS_class-native = "gettext-minimal-native"
 PROVIDES = "virtual/libintl virtual/gettext"
 PROVIDES_class-native = "virtual/gettext-native"
@@ -15,6 +15,8 @@  SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
 	   file://parallel.patch \
           "
 
+PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses,"
+
 LDFLAGS_prepend_libc-uclibc = " -lrt -lpthread "
 
 SRC_URI[md5sum] = "0c86e5af70c195ab8bd651d17d783928"
@@ -30,7 +32,6 @@  EXTRA_OECONF += "--without-lispdir \
                  --disable-openmp \
                  --disable-acl \
                  --with-included-glib \
-                 --with-libncurses-prefix=${STAGING_LIBDIR}/.. \
                  --without-emacs \
                  --without-cvs \
                  --without-git \