summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2011-03-31 13:43:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-04 14:09:57 +0100
commit9487fbe615ad26827a342f9a9dbca2fd15cb8b10 (patch)
treebb93dee33a734efd33e1137cfe99f1d2e40cddad
parent115ffb9a3cfc3f8b6590f274952e100edaa8a957 (diff)
downloadpoky-9487fbe615ad26827a342f9a9dbca2fd15cb8b10.tar.gz
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. (From OE-Core rev: 396db4b577b3e7b334e9019fc43d5e03d5343479) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/xorg-lib-common.inc2
-rw-r--r--meta/recipes-graphics/xorg-proto/xorg-proto-common.inc1
2 files changed, 2 insertions, 1 deletions
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}"
13 13
14inherit autotools pkgconfig 14inherit autotools pkgconfig
15 15
16EXTRA_OECONF = "--enable-malloc0returnsnull" 16EXTRA_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}"
14DEPENDS = "util-macros" 14DEPENDS = "util-macros"
15 15
16inherit autotools pkgconfig 16inherit autotools pkgconfig
17EXTRA_OECONF = "--with-fop=no"
17 18
18# ${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
19RDEPENDS_${PN}-dev = "" 20RDEPENDS_${PN}-dev = ""