summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-08-19 18:06:36 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-08-19 18:06:36 +0000
commitdd3a870ed4f6deed3141c596e2b5520eb9f8fba8 (patch)
tree01a8ace82e98a01909ffd2036993bdcccbbdd373
parent6760f8efc93922a44d225129143387c37d760f1b (diff)
parent171e4483d1c184ea872b53d7c4b8ee2d097a6ac6 (diff)
merge of '355866fda3e7098f7d30f22852c4e3ad5145126b'
and '5ad8db39f892a4c9b9c381f015e9709e5cd01b4a'
-rw-r--r--packages/gettext/gettext_0.17.bb11
1 files changed, 3 insertions, 8 deletions
diff --git a/packages/gettext/gettext_0.17.bb b/packages/gettext/gettext_0.17.bb
index ed64c1ea87..7beaee1294 100644
--- a/packages/gettext/gettext_0.17.bb
+++ b/packages/gettext/gettext_0.17.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "The GNU internationalization library."
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 = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
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'