From 396db4b577b3e7b334e9019fc43d5e03d5343479 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Thu, 31 Mar 2011 13:43:41 +0100 Subject: xorg-[lib-common|proto-common]: disable use of fop document generation On Fedora 15 I see a huge Java backtrace when document generation runs for some xorg libs. As fop is automatically detected, with the possibility of detecting fop on the host whilst doing target builds, the safest bet is to explicitly disable fop for document generation. Signed-off-by: Joshua Lock --- meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 2 +- meta/recipes-graphics/xorg-proto/xorg-proto-common.inc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc index 4ed8c866ea..d843d65efd 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" +EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no" diff --git a/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc b/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc index 92aa1fe6d3..ab1af28311 100644 --- a/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc +++ b/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc @@ -14,6 +14,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" DEPENDS = "util-macros" inherit autotools pkgconfig +EXTRA_OECONF = "--with-fop=no" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = "" -- cgit 1.2.3-korg