aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/xorg-lib
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-09-11 23:57:08 +0800
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-09-12 00:31:19 +0800
commit18bfe69b58341220399c1a1f9acc0bbc7a905eb8 (patch)
tree0a878cce7cfa536c8a4971ae0a8d043704af4cda /recipes/xorg-lib
parent9b6ada9d92d97509966d445329812103741c9307 (diff)
downloadopenembedded-18bfe69b58341220399c1a1f9acc0bbc7a905eb8.tar.gz
libx11: Disable generating PS/PDF for the spec
libx11 would search for groff and ps2pdf to generate a PS/PDF of the specs, if a broken ps2pdf (fedora 14 testing) is installed the build will fail barfing about Fontmap.local. The PS/PDF does not appear to be in any FILES_* so we can disable the PS/PDF generation at tall and not run into the issue. The fedora bug is at: https://bugzilla.redhat.com/show_bug.cgi?id=610301. libx11.inc: Disable groff, ps2pdf effectively disabling generating a PS/PDF for the X11 spec xorg-lib-common.inc: Bump the INC_PR used by libx11.inc. This sadly affects quite some other recipes too.
Diffstat (limited to 'recipes/xorg-lib')
-rw-r--r--recipes/xorg-lib/libx11.inc6
-rw-r--r--recipes/xorg-lib/xorg-lib-common.inc2
2 files changed, 4 insertions, 4 deletions
diff --git a/recipes/xorg-lib/libx11.inc b/recipes/xorg-lib/libx11.inc
index 3a1ad95c5e..b9eb64ad55 100644
--- a/recipes/xorg-lib/libx11.inc
+++ b/recipes/xorg-lib/libx11.inc
@@ -22,9 +22,9 @@ FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
XORG_PN = "libX11"
-EXTRA_OECONF += " --with-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h"
-EXTRA_OECONF_virtclass-native = " --without-xcb"
-EXTRA_OECONF_virtclass-nativesdk = " --without-xcb"
+EXTRA_OECONF += " --with-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --with-groff=no --with-ps2pdf=no"
+EXTRA_OECONF_virtclass-native = " --without-xcb --with-groff=no --with-ps2pdf=no"
+EXTRA_OECONF_virtclass-nativesdk = " --without-xcb --with-groff=no --with-ps2pdf=no"
# Below option is added to overcome the GCC bug on ARM
# see http://gcc.gnu.org/PR42981 for further details.
diff --git a/recipes/xorg-lib/xorg-lib-common.inc b/recipes/xorg-lib/xorg-lib-common.inc
index 9da51dbe84..9a3bad857a 100644
--- a/recipes/xorg-lib/xorg-lib-common.inc
+++ b/recipes/xorg-lib/xorg-lib-common.inc
@@ -4,7 +4,7 @@ LICENSE = "MIT-X"
DEPENDS = "util-macros xorg-headers-native"
XORG_PN = "${BPN}"
-INC_PR = "r8"
+INC_PR = "r9"
SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2;name=archive"