From 224ff370b4636cdd33c47c1e6341ef43a67e0227 Mon Sep 17 00:00:00 2001 From: Lauri Hintsala Date: Tue, 20 Mar 2012 14:58:02 +0200 Subject: 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. (From OE-Core rev: 5d404fdb36b0535ce758d98408b02134cdbce4ee) Signed-off-by: Lauri Hintsala Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-xserver/xserver-kdrive.inc | 1 + meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/recipes-graphics/xorg-xserver') 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 \ -- cgit v1.2.3-54-g00ecf