summaryrefslogtreecommitdiffstats
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:39 +0000
commit224ff370b4636cdd33c47c1e6341ef43a67e0227 (patch)
tree915ea4faab1430022c4f1403d54d85e78fdf3443
parent17d42a46829e4462b077e7bd11e6cbb8e7143b3a (diff)
downloadpoky-224ff370b4636cdd33c47c1e6341ef43a67e0227.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. (From OE-Core rev: 5d404fdb36b0535ce758d98408b02134cdbce4ee) 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 \
102 --disable-xkb --disable-xnest --disable-xvfb \ 102 --disable-xkb --disable-xnest --disable-xvfb \
103 --disable-xevie --disable-xprint --disable-xtrap \ 103 --disable-xevie --disable-xprint --disable-xtrap \
104 --disable-dmx \ 104 --disable-dmx \
105 --without-dtrace \
105 --with-default-font-path=built-ins \ 106 --with-default-font-path=built-ins \
106 --enable-tslib --enable-xcalibrate \ 107 --enable-tslib --enable-xcalibrate \
107 ac_cv_file__usr_share_X11_sgml_defs_ent=no" 108 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"
7EXTRA_OECONF += "--disable-glx" 7EXTRA_OECONF += "--disable-glx"
8 8
9PE = "1" 9PE = "1"
10PR = "r28" 10PR = "r29"
11 11
12SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ 12SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
13 file://extra-kmodes.patch \ 13 file://extra-kmodes.patch \