summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWenzong Fan <wenzong.fan@windriver.com>2012-02-14 01:42:59 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-28 12:27:52 (GMT)
commit695a609057123c08b47f2133af05e74ff522d88f (patch)
tree84bc3e2ba92109a06f7ac7ea41377c658388ff12
parent991e34ca89757fc6cb46cba750c62f02b5ee92cb (diff)
downloadpoky-695a609057123c08b47f2133af05e74ff522d88f.tar.gz
gettext: Get gettext use its own libunistring
According to its documentation, gettext 0.18.1.1 needs either libunistring or it will use its own internal version. Just add a configure option '--with-included-libunistring' to force the latter to avoid races. [YOCTO#1934] (From OE-Core rev: f4f242cf8af9df3dc2394d245740b173f34cbf81) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/gettext/gettext_0.18.1.1.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
index 615582e..3c65dca 100644
--- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
5LICENSE = "GPL-3+ & LGPL-2.1+" 5LICENSE = "GPL-3+ & LGPL-2.1+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 6LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
7 7
8PR = "r6" 8PR = "r7"
9DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat" 9DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat"
10DEPENDS_virtclass-native = "libxml2-native" 10DEPENDS_virtclass-native = "libxml2-native"
11PROVIDES = "virtual/libintl virtual/gettext" 11PROVIDES = "virtual/libintl virtual/gettext"
@@ -38,6 +38,7 @@ EXTRA_OECONF += "--without-lispdir \
38 --without-git \ 38 --without-git \
39 --with-included-libxml \ 39 --with-included-libxml \
40 --with-included-libcroco \ 40 --with-included-libcroco \
41 --with-included-libunistring \
41 " 42 "
42 43
43acpaths = '-I ${S}/gettext-runtime/m4 \ 44acpaths = '-I ${S}/gettext-runtime/m4 \