Patchwork [CONSOLIDATED,PULL,09/12] libx11: skip self if x11 not in DISTRO_FEATURES

login
register
mail settings
Submitter Saul Wold
Date Aug. 14, 2011, 11:30 p.m.
Message ID <eb1b677c3d9c400571aee10ae328a543d5b5b95a.1313363644.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/9825/
State New, archived
Headers show

Comments

Saul Wold - Aug. 14, 2011, 11:30 p.m.
From: Phil Blundell <philb@gnu.org>

This stops (most) x11 packages leaking into a non-x11 distro by mistake.

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/recipes-graphics/xorg-lib/libx11.inc |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

Patch

diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index c156ce6..455753f 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -42,3 +42,8 @@  do_compile() {
 # Multiple libx11 derivatives from from this file and are selected by virtual/libx11
 # A world build should only build the correct version, not all of them.
 EXCLUDE_FROM_WORLD = "1"
+
+python () {
+       if not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d):
+       	  raise bb.parse.SkipPackage("X11 not enabled for this DISTRO")
+}