Patchwork [1/1] xserver-kdrive: compile xserver without dtrace support

login
register
mail settings
Submitter Lauri Hintsala
Date March 20, 2012, 12:58 p.m.
Message ID <1332248282-5226-1-git-send-email-lauri.hintsala@bluegiga.com>
Download mbox | patch
Permalink /patch/23857/
State Accepted
Commit 5d404fdb36b0535ce758d98408b02134cdbce4ee
Headers show

Comments

Lauri Hintsala - March 20, 2012, 12:58 p.m.
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>
---
This issue has been existed also with xserver-xorg. It was already fixed
to xserver-xorg by commit 01c1a0f7.
---
 .../xorg-xserver/xserver-kdrive.inc                |    1 +
 .../xorg-xserver/xserver-kdrive_1.7.99.2.bb        |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)
Saul Wold - March 20, 2012, 10:50 p.m.
On 03/20/2012 05:58 AM, Lauri Hintsala wrote:
> 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>
> ---
> This issue has been existed also with xserver-xorg. It was already fixed
> to xserver-xorg by commit 01c1a0f7.
> ---
>   .../xorg-xserver/xserver-kdrive.inc                |    1 +
>   .../xorg-xserver/xserver-kdrive_1.7.99.2.bb        |    2 +-
>   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 52b63ed..58dee27 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 3b3a004..360a0f3 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 \

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive.inc b/meta/recipes-graphics/xorg-xserver/xserver-kdrive.inc
index 52b63ed..58dee27 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 3b3a004..360a0f3 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 \