summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-01-10 17:28:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-11 10:26:07 +0000
commit860705cebf49afc2e933f440b71ab027abac0db2 (patch)
tree383b6a13a30bff5e89037b35a68bbae077e3d110
parent7ba16edc3ceac32b9d9395fd8e79c1edd2290e83 (diff)
downloadpoky-860705cebf49afc2e933f440b71ab027abac0db2.tar.gz
gettext: rationalise optional dependencies
gettext has optional dependencies on libxml2, glib, libcroco and libunistring. If they're not available then gettext will use internal copies, but it can also use system libraries. For gettext-native and nativesdk-gettext continue to use the internal copies to reduce the dependencies, but for target use the system shared libraries. Also gettext 0.19.7 onwards swapped expat for libxm2, so remove the build dependency on expat. (From OE-Core rev: a82aa376a9229428ec25629e97a1efa56f0afae7) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/gettext/gettext_0.19.8.1.bb18
1 files changed, 11 insertions, 7 deletions
diff --git a/meta/recipes-core/gettext/gettext_0.19.8.1.bb b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
index c2059e608b..97083c0da2 100644
--- a/meta/recipes-core/gettext/gettext_0.19.8.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.19.8.1.bb
@@ -8,7 +8,7 @@ SECTION = "libs"
8LICENSE = "GPLv3+ & LGPL-2.1+" 8LICENSE = "GPLv3+ & LGPL-2.1+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 9LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
10 10
11DEPENDS = "gettext-native virtual/libiconv expat" 11DEPENDS = "gettext-native virtual/libiconv"
12DEPENDS_class-native = "gettext-minimal-native" 12DEPENDS_class-native = "gettext-minimal-native"
13PROVIDES = "virtual/libintl virtual/gettext" 13PROVIDES = "virtual/libintl virtual/gettext"
14PROVIDES_class-native = "virtual/gettext-native" 14PROVIDES_class-native = "virtual/gettext-native"
@@ -22,8 +22,6 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
22SRC_URI[md5sum] = "97e034cf8ce5ba73a28ff6c3c0638092" 22SRC_URI[md5sum] = "97e034cf8ce5ba73a28ff6c3c0638092"
23SRC_URI[sha256sum] = "ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43" 23SRC_URI[sha256sum] = "ff942af0e438ced4a8b0ea4b0b6e0d6d657157c5e2364de57baa279c1c125c43"
24 24
25PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses,"
26
27inherit autotools texinfo 25inherit autotools texinfo
28 26
29EXTRA_OECONF += "--without-lispdir \ 27EXTRA_OECONF += "--without-lispdir \
@@ -33,18 +31,24 @@ EXTRA_OECONF += "--without-lispdir \
33 --disable-native-java \ 31 --disable-native-java \
34 --disable-openmp \ 32 --disable-openmp \
35 --disable-acl \ 33 --disable-acl \
36 --with-included-glib \
37 --without-emacs \ 34 --without-emacs \
38 --without-cvs \ 35 --without-cvs \
39 --without-git \ 36 --without-git \
40 --with-included-libxml \
41 --with-included-libcroco \
42 --with-included-libunistring \
43 " 37 "
44EXTRA_OECONF_append_class-target = " \ 38EXTRA_OECONF_append_class-target = " \
45 --with-bisonlocaledir=${datadir}/locale \ 39 --with-bisonlocaledir=${datadir}/locale \
46" 40"
47 41
42PACKAGECONFIG ??= "croco glib libxml libunistring"
43PACKAGECONFIG_class-native = ""
44PACKAGECONFIG_class-nativesdk = ""
45
46PACKAGECONFIG[croco] = "--without-included-libcroco,--with-included-libcroco,libcroco"
47PACKAGECONFIG[glib] = "--without-included-glib,--with-included-glib,glib-2.0"
48PACKAGECONFIG[libxml] = "--without-included-libxml,--with-included-libxml,libxml2"
49PACKAGECONFIG[libunistring] = "--without-included-libunistring,--with-included-libunistring,libunistring"
50PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--disable-curses,ncurses,"
51
48acpaths = '-I ${S}/gettext-runtime/m4 \ 52acpaths = '-I ${S}/gettext-runtime/m4 \
49 -I ${S}/gettext-tools/m4' 53 -I ${S}/gettext-tools/m4'
50 54