diff options
| author | Xiaofeng Yan <xiaofeng.yan@windriver.com> | 2011-12-12 19:28:37 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-13 12:21:04 +0000 |
| commit | e20bb10573dd67fd60b5b7f944eb0cbec2332a04 (patch) | |
| tree | fd285ee07582c01bb737b3473d6809ec21de385d | |
| parent | dd5b44034014ba1962cfca1bf7430f8c8dc5243c (diff) | |
| download | openembedded-core-e20bb10573dd67fd60b5b7f944eb0cbec2332a04.tar.gz openembedded-core-e20bb10573dd67fd60b5b7f944eb0cbec2332a04.tar.bz2 openembedded-core-e20bb10573dd67fd60b5b7f944eb0cbec2332a04.zip | |
pango: Disable x11 when pango doesn't run over x11
pango run over x11 at current OE-core. If pango want to run over non-x11, then \
the configuration related to x11 should be disabled.
[YOCTO #1674]
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-graphics/pango/pango.inc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index 6d94e02878..ff5a73ae67 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc @@ -10,13 +10,22 @@ SECTION = "libs" LICENSE = "LGPL" X11DEPENDS = "virtual/libx11 libxft" -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo " + +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}" + PACKAGES_DYNAMIC = "pango-module-*" RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc" inherit gnome +# Create a pango-modules package +ALLOW_EMPTY_${BPN}-modules = "1" +PACKAGES += "${BPN}-modules" +RRECOMMENDS_${BPN}-modules = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("pango-module") != -1])}" + EXTRA_AUTORECONF = "" @@ -25,8 +34,7 @@ FULL_OPTIMIZATION_arm = "-O2" EXTRA_OECONF = "--disable-glibtest \ --enable-explicit-deps=no \ - --disable-debug \ - ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" + --disable-debug" LEAD_SONAME = "libpango-1.0*" LIBV = "1.6.0" @@ -46,6 +54,6 @@ python populate_packages_prepend () { do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules') } -FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*${SOLIBS}" +FILES_${PN} = "/etc/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" |