summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorXiaofeng Yan <xiaofeng.yan@windriver.com>2011-12-12 19:28:37 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-13 12:28:10 +0000
commit627b230f56183be59c04e475c2ded9479d6a465e (patch)
treec512f124876c9ca9788f4601790fe301d3360676 /meta
parentf1a487873c82bf56cd27e6e23f08c29ed3a00d50 (diff)
downloadpoky-627b230f56183be59c04e475c2ded9479d6a465e.tar.gz
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] (From OE-Core rev: e20bb10573dd67fd60b5b7f944eb0cbec2332a04) Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/pango/pango.inc16
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"
10LICENSE = "LGPL" 10LICENSE = "LGPL"
11 11
12X11DEPENDS = "virtual/libx11 libxft" 12X11DEPENDS = "virtual/libx11 libxft"
13DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" 13DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo "
14
15PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
16PACKAGECONFIG[x11] = "--with-x,--without-x,${X11DEPENDS}"
17
14 18
15PACKAGES_DYNAMIC = "pango-module-*" 19PACKAGES_DYNAMIC = "pango-module-*"
16 20
17RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc" 21RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc"
18 22
19inherit gnome 23inherit gnome
24# Create a pango-modules package
25ALLOW_EMPTY_${BPN}-modules = "1"
26PACKAGES += "${BPN}-modules"
27RRECOMMENDS_${BPN}-modules = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("pango-module") != -1])}"
28
20 29
21EXTRA_AUTORECONF = "" 30EXTRA_AUTORECONF = ""
22 31
@@ -25,8 +34,7 @@ FULL_OPTIMIZATION_arm = "-O2"
25 34
26EXTRA_OECONF = "--disable-glibtest \ 35EXTRA_OECONF = "--disable-glibtest \
27 --enable-explicit-deps=no \ 36 --enable-explicit-deps=no \
28 --disable-debug \ 37 --disable-debug"
29 ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
30 38
31LEAD_SONAME = "libpango-1.0*" 39LEAD_SONAME = "libpango-1.0*"
32LIBV = "1.6.0" 40LIBV = "1.6.0"
@@ -46,6 +54,6 @@ python populate_packages_prepend () {
46 do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules') 54 do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules')
47} 55}
48 56
49FILES_${PN} = "/etc ${bindir}/* ${libdir}/libpango*${SOLIBS}" 57FILES_${PN} = "/etc/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
50FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" 58FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug"
51FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" 59FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"