[oe-commits] org.oe.dev gettext: fix --enable-nls stuff

[woglinde2 commit]

gettext: fix --enable-nls stuff
* --enable-nls has diffent meaning on gettext self
  libintl is only buildable when you enable nls, which
  is default on gettext package self, so remove my nasty hack
* fixing later that no locales package are made
  when the user wants no nls
* add gettext-native ncurses expat to the depends as suggested in
  the DEPENDENCIES file
* bump PR

Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: 5ad8db39f892a4c9b9c381f015e9709e5cd01b4a
ViewMTN: http://monotone.openembedded.org/revision/info/5ad8db39f892a4c9b9c381f015e9709e5cd01b4a
Files:
1
packages/gettext/gettext_0.17.bb
Diffs:

#
# mt diff -rc05229a8c5246cada336c3cfe5a3417367366836 -r5ad8db39f892a4c9b9c381f015e9709e5cd01b4a
#
#
#
# patch "packages/gettext/gettext_0.17.bb"
#  from [d39e7c39ab4154e36e9937b5f173e7652e401999]
#    to [089d02dc9fa1adf968040048a2f64700470abe3a]
#
============================================================
--- packages/gettext/gettext_0.17.bb	d39e7c39ab4154e36e9937b5f173e7652e401999
+++ packages/gettext/gettext_0.17.bb	089d02dc9fa1adf968040048a2f64700470abe3a
@@ -2,9 +2,9 @@ LICENSE = "GPL"
 HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
 SECTION = "libs"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 DEFAULT_PREFERENCE = "-1"
-DEPENDS = "virtual/libiconv"
+DEPENDS = "gettext-native virtual/libiconv ncurses expat"
 PROVIDES = "virtual/libintl"
 
 SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
@@ -15,12 +15,6 @@ SRC_URI_append_linux-uclibcgnueabi = " f
 SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch;patch=1"
 SRC_URI_append_linux-uclibcgnueabi = " file://gettext-error_print_progname.patch;patch=1"
 
-#gettext.class cant be inherit here so use this hack same as in libiconv
-DEPENDS += "${@['','gettext-native'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
-
-EXTRA_OECONF +=  "${@['--disable-nls','--enable-nls'][bb.data.getVar('USE_NLS', d, 1) == 'yes']}"
-
-
 PARALLEL_MAKE = ""
 
 inherit autotools
@@ -34,6 +28,7 @@ EXTRA_OECONF += "--without-lispdir \
 		 --with-included-glib \
 		 --without-emacs \
 	        "
+
 acpaths = '-I ${S}/autoconf-lib-link/m4/ \
 	   -I ${S}/gettext-runtime/m4 \
 	   -I ${S}/gettext-tools/m4'