diff options
| author | Joshua Lock <josh@linux.intel.com> | 2011-03-31 13:43:41 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-04 13:54:22 +0100 |
| commit | 396db4b577b3e7b334e9019fc43d5e03d5343479 (patch) | |
| tree | d844feb052322437b2ba93039392a70202d649ad /meta | |
| parent | f6bf1971d2df74de3c6411691c9a398827b0598e (diff) | |
| download | openembedded-core-396db4b577b3e7b334e9019fc43d5e03d5343479.tar.gz openembedded-core-396db4b577b3e7b334e9019fc43d5e03d5343479.tar.bz2 openembedded-core-396db4b577b3e7b334e9019fc43d5e03d5343479.tar.xz openembedded-core-396db4b577b3e7b334e9019fc43d5e03d5343479.zip | |
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 <josh@linux.intel.com>
Diffstat (limited to 'meta')
| -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 | 1 |
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 4ed8c866e..d843d65ef 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 92aa1fe6d..ab1af2831 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 = "" |