aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Hintsala <lauri.hintsala@bluegiga.com>2012-03-20 14:58:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-20 15:21:18 +0000
commit5d404fdb36b0535ce758d98408b02134cdbce4ee (patch)
tree702c0093e770b94429db0790719bb9811aa3e63b
parent85e4d0c4bb024a67b61afb0f0fedfb15d6aa0d18 (diff)
downloadopenembedded-core-contrib-5d404fdb36b0535ce758d98408b02134cdbce4ee.tar.gz
xserver-kdrive: compile xserver without dtrace support
Cross compiling of xserver-kdrive fails if dtrace is enabled. Configure script enables dtrace automatically if dtrace binary exists. xserver-kdrive compiling was failed if systemtap package was builded beforehand because systemtap provides dtrace binary. Signed-off-by: Lauri Hintsala <lauri.hintsala@bluegiga.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-kdrive.inc1
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive.inc b/meta/recipes-graphics/xorg-xserver/xserver-kdrive.inc
index 52b63ed0f4..58dee2793a 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive.inc
@@ -102,6 +102,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \
--disable-xkb --disable-xnest --disable-xvfb \
--disable-xevie --disable-xprint --disable-xtrap \
--disable-dmx \
+ --without-dtrace \
--with-default-font-path=built-ins \
--enable-tslib --enable-xcalibrate \
ac_cv_file__usr_share_X11_sgml_defs_ent=no"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb
index 3b3a004f6a..360a0f3ab9 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb
@@ -7,7 +7,7 @@ RDEPENDS_${PN} += "xkeyboard-config"
EXTRA_OECONF += "--disable-glx"
PE = "1"
-PR = "r28"
+PR = "r29"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
file://extra-kmodes.patch \