diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2011-12-23 11:18:24 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-17 14:53:00 +0000 |
| commit | 58f18f04d7783cc75127f7f1c0921051431dcd8c (patch) | |
| tree | a25ac0034ae09e23ab6ed1439780437d796e15ee /meta/recipes-graphics | |
| parent | 545a7407361a7e144a0f868e1a095bf7b10fffd8 (diff) | |
| download | openembedded-core-contrib-58f18f04d7783cc75127f7f1c0921051431dcd8c.tar.gz | |
xorg-*: disable xmlto where it was failing
* meta-oe now provides xmlto-native
http://git.openembedded.org/meta-openembedded/commit/?id=ab8f876ca8fa223c183e3db2029cce88f3435a27
but not the stylesheets for buildhosts without them it's unusable and fails, because xorg macros
autodetecting xmlto available, see:
http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-December/037066.html
after adding xmlto-native and stylesheets-native to DEPENDS we can enable it again
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-proto/xorg-proto-common.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc index d843d65efd5..d106054ef14 100644 --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc @@ -13,4 +13,4 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig -EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no" +EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no --without-xmlto" diff --git a/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc b/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc index 765e30a3aa4..856f4d8f33f 100644 --- a/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc +++ b/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc @@ -14,7 +14,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" DEPENDS = "util-macros" inherit autotools pkgconfig -EXTRA_OECONF = "--with-fop=no" +EXTRA_OECONF = "--with-fop=no --without-xmlto" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = "" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index b387790d10d..ca7d33a6610 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -9,4 +9,5 @@ EXTRA_OECONF += "\ --enable-glx-tls \ --with-pic \ --with-int10=x86emu \ + --without-xmlto \ " |