sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Xiaofeng Yan 2011-12-12 19:28:37 +08:00 committed by Richard Purdie
parent f1a487873c
commit 627b230f56
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meta/recipes-graphics/pango/pango.inc
View File

@ -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"