From patchwork Tue Jan 17 08:32:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED,PULL,29/62] xorg-*: disable xmlto where it was failing Date: Tue, 17 Jan 2012 08:32:14 -0000 From: Saul Wold X-Patchwork-Id: 19485 Message-Id: <840eb8c54b5025fea00cfedf849c3386be10e1ee.1326786990.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Martin Jansa * 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 --- meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 2 +- .../xorg-proto/xorg-proto-common.inc | 2 +- .../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 d843d65..d106054 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 765e30a..856f4d8 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 b387790..ca7d33a 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 \ "