diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-10-20 20:49:20 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-01 10:05:45 +0000 |
commit | b41a2e62b81518b1ac13b8085cf5f36e1ab4eca0 (patch) | |
tree | d2ed95409effc7902dd8f237b98b85a2307c5d54 /meta/recipes-core/glib-2.0/glib.inc | |
parent | fffe8fed85b3b460abd1999e8ddd591ecbcbde76 (diff) | |
download | poky-b41a2e62b81518b1ac13b8085cf5f36e1ab4eca0.tar.gz |
glib-2.0: Upgrade 2.48.2 -> 2.50.1
Six-monthly feature release.
glib-2.0-utils now includes "gio" command line utility.
Drop a patch that's now upstream. Add PACKAGECONFIG for libmount,
enabled by default.
(From OE-Core rev: 361dc9990fb5fc5604ba8e9d2f1188fd440e916d)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib.inc')
-rw-r--r-- | meta/recipes-core/glib-2.0/glib.inc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 07d8734d7c..cb6aca702f 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc | |||
@@ -30,9 +30,10 @@ inherit autotools gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even | |||
30 | 30 | ||
31 | S = "${WORKDIR}/glib-${PV}" | 31 | S = "${WORKDIR}/glib-${PV}" |
32 | 32 | ||
33 | PACKAGECONFIG ??= "system-pcre" | 33 | PACKAGECONFIG ??= "system-pcre libmount" |
34 | # To use the system pcre it must be configured with --enable-unicode-properties | 34 | # To use the system pcre it must be configured with --enable-unicode-properties |
35 | PACKAGECONFIG[system-pcre] = "--with-pcre=system,--with-pcre=internal,libpcre" | 35 | PACKAGECONFIG[system-pcre] = "--with-pcre=system,--with-pcre=internal,libpcre" |
36 | PACKAGECONFIG[libmount] = "--enable-libmount,--disable-libmount,util-linux" | ||
36 | PACKAGECONFIG[manpages] = "--enable-man --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog.xml, --disable-man, libxslt-native xmlto-native" | 37 | PACKAGECONFIG[manpages] = "--enable-man --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog.xml, --disable-man, libxslt-native xmlto-native" |
37 | 38 | ||
38 | CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap" | 39 | CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap" |