summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-12-23 11:18:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-17 14:53:20 +0000
commit5fabe9080862e2ba5c4ed58c750f64d916df3f59 (patch)
tree6d7af9af1c02023c70026b342c013fabc99b189d /meta/recipes-graphics
parent1db019ac7c4f5d5ca6a958e691f7014d62b720c8 (diff)
downloadpoky-5fabe9080862e2ba5c4ed58c750f64d916df3f59.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 (From OE-Core rev: 58f18f04d7783cc75127f7f1c0921051431dcd8c) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r--meta/recipes-graphics/xorg-lib/xorg-lib-common.inc2
-rw-r--r--meta/recipes-graphics/xorg-proto/xorg-proto-common.inc2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc1
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 d843d65efd..d106054ef1 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}"
13 13
14inherit autotools pkgconfig 14inherit autotools pkgconfig
15 15
16EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no" 16EXTRA_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 765e30a3aa..856f4d8f33 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}"
14DEPENDS = "util-macros" 14DEPENDS = "util-macros"
15 15
16inherit autotools pkgconfig 16inherit autotools pkgconfig
17EXTRA_OECONF = "--with-fop=no" 17EXTRA_OECONF = "--with-fop=no --without-xmlto"
18 18
19# ${PN} is empty so we need to tweak -dev and -dbg package dependencies 19# ${PN} is empty so we need to tweak -dev and -dbg package dependencies
20RDEPENDS_${PN}-dev = "" 20RDEPENDS_${PN}-dev = ""
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index b387790d10..ca7d33a661 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 += "\
9 --enable-glx-tls \ 9 --enable-glx-tls \
10 --with-pic \ 10 --with-pic \
11 --with-int10=x86emu \ 11 --with-int10=x86emu \
12 --without-xmlto \
12" 13"