diff options
| author |   Phil Blundell <philb@gnu.org> | 2011-08-26 15:23:02 +0100 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2011-08-26 12:34:03 -0700 |
| commit | ac92a573dd38270a28967c76472435cfd7f9bdfe (patch) | |
| tree | aee21675b1fa798b8e66c3614e087403a4358719 /meta/recipes-graphics/pango | |
| parent | f55c96b6d53ecff865145fa22f286c89c7336515 (diff) | |
| download | openembedded-core-ac92a573dd38270a28967c76472435cfd7f9bdfe.tar.gz | |
pango: make x11 support conditional on DISTRO_FEATURES
This allows pango to build on DISTROs which don't enable x11.
Also adjust the SECTION since pango isn't really an X library.
Signed-off-by: Phil Blundell <philb@gnu.org>
Diffstat (limited to 'meta/recipes-graphics/pango')
| -rw-r--r-- | meta/recipes-graphics/pango/pango.inc | 10 | ||||
| -rw-r--r-- | meta/recipes-graphics/pango/pango_1.28.4.bb | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index 5a8a5aef75..a8e99e2f6d 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc @@ -6,14 +6,15 @@ been done in the context of the GTK+ widget toolkit. Pango forms the \ core of text and font handling for GTK+-2.x." HOMEPAGE = "http://www.pango.org/" BUGTRACKER = "http://bugzilla.gnome.org" -SECTION = "x11/libs" +SECTION = "libs" LICENSE = "LGPL" -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv virtual/libx11 libxft gtk-doc-native cairo" +X11DEPENDS = "virtual/libx11 libxft" +DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" PACKAGES_DYNAMIC = "pango-module-*" -RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc" +RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc" inherit gnome @@ -24,7 +25,8 @@ FULL_OPTIMIZATION_arm = "-O2" EXTRA_OECONF = "--disable-glibtest \ --enable-explicit-deps=no \ - --disable-debug" + --disable-debug \ + ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" LEAD_SONAME = "libpango-1.0*" LIBV = "1.6.0" diff --git a/meta/recipes-graphics/pango/pango_1.28.4.bb b/meta/recipes-graphics/pango/pango_1.28.4.bb index 600f00b740..68ab700c8c 100644 --- a/meta/recipes-graphics/pango/pango_1.28.4.bb +++ b/meta/recipes-graphics/pango/pango_1.28.4.bb @@ -2,7 +2,7 @@ require pango.inc LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" -PR = "r0" +PR = "r1" SRC_URI += "file://no-tests.patch" |