Patchwork valgrind: Support compilation without X11

login
register
mail settings
Submitter Mike Crowe
Date March 6, 2012, 2:55 p.m.
Message ID <1331045739-5723-1-git-send-email-mac@mcrowe.com>
Download mbox | patch
Permalink /patch/22761/
State Accepted
Commit 8a4bc16b853f3d5092c588703eef0ccb6aeb6ba1
Headers show

Comments

Mike Crowe - March 6, 2012, 2:55 p.m.
Only depend on X libraries if the distribution has X support.

Signed-off-by: Mike Crowe <mac@mcrowe.com>
---
 meta/recipes-devtools/valgrind/valgrind_3.7.0.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
Saul Wold - March 13, 2012, 3:56 p.m.
On 03/06/2012 06:55 AM, Mike Crowe wrote:
> Only depend on X libraries if the distribution has X support.
>
> Signed-off-by: Mike Crowe<mac@mcrowe.com>
> ---
>   meta/recipes-devtools/valgrind/valgrind_3.7.0.bb |    6 ++++--
>   1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
> index 9c53262..d7c7b24 100644
> --- a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
> +++ b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
> @@ -6,8 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \
>                       file://include/pub_tool_basics.h;beginline=1;endline=29;md5=0ef036a7ddce4cdc738d65d63b3e8153 \
>                       file://include/valgrind.h;beginline=1;endline=56;md5=aee56014c1dd64260a59fd4df38752f6 \
>                       file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215"
> -DEPENDS = "virtual/libx11"
> -PR = "r3"
> +
> +X11DEPENDS = "virtual/libx11"
> +DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
> +PR = "r4"
>
>   SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
>   	   file://fix_issue_caused_by_ccache.patch \

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
index 9c53262..d7c7b24 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.7.0.bb
@@ -6,8 +6,10 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \
                     file://include/pub_tool_basics.h;beginline=1;endline=29;md5=0ef036a7ddce4cdc738d65d63b3e8153 \
                     file://include/valgrind.h;beginline=1;endline=56;md5=aee56014c1dd64260a59fd4df38752f6 \
                     file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215"
-DEPENDS = "virtual/libx11"
-PR = "r3"
+
+X11DEPENDS = "virtual/libx11"
+DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
+PR = "r4"
 
 SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
 	   file://fix_issue_caused_by_ccache.patch \