[CONSOLIDATED,PULL,18/20] valgrind: Support compilation without X11

Submitted by Saul Wold on March 6, 2012, 5:03 p.m.

Details

Message ID b87ad5e6cd7e901e467e5a75e0b84bf1a11a4c8c.1331053126.git.sgw@linux.intel.com
State New
Headers show

Commit Message

Saul Wold March 6, 2012, 5:03 p.m.
From: Mike Crowe <mac@mcrowe.com>

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(-)

Patch hide | download patch | download mbox

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 \