diff options
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index 748a48cef3..9057edc746 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc | |||
| @@ -49,8 +49,3 @@ do_compile_prepend() { | |||
| 49 | # Multiple libx11 derivatives from from this file and are selected by virtual/libx11 | 49 | # Multiple libx11 derivatives from from this file and are selected by virtual/libx11 |
| 50 | # A world build should only build the correct version, not all of them. | 50 | # A world build should only build the correct version, not all of them. |
| 51 | EXCLUDE_FROM_WORLD = "1" | 51 | EXCLUDE_FROM_WORLD = "1" |
| 52 | |||
| 53 | python () { | ||
| 54 | if not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): | ||
| 55 | raise bb.parse.SkipPackage("X11 not enabled for this DISTRO") | ||
| 56 | } | ||
diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc index d106054ef1..3d5d378c87 100644 --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | |||
| @@ -14,3 +14,9 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" | |||
| 14 | inherit autotools pkgconfig | 14 | inherit autotools pkgconfig |
| 15 | 15 | ||
| 16 | EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no --without-xmlto" | 16 | EXTRA_OECONF = "--enable-malloc0returnsnull --with-fop=no --without-xmlto" |
| 17 | |||
| 18 | python () { | ||
| 19 | whitelist = [ "pixman" ] | ||
| 20 | if not d.getVar('BPN', True) in whitelist and not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): | ||
| 21 | raise bb.parse.SkipPackage("X11 not enabled for this DISTRO") | ||
| 22 | } | ||
