diff options
author | Ross Burton <ross.burton@intel.com> | 2012-09-11 20:17:55 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-12 15:13:47 +0100 |
commit | c0fff56ef0681214e0813bf7d68969d951acafd5 (patch) | |
tree | 92d74cfd848bcd9272a5d21bfb10f916851e6de5 /meta/recipes-graphics/xorg-lib/libx11.inc | |
parent | 85816c84eb929954447a9abbea1e473351a71c50 (diff) | |
download | poky-c0fff56ef0681214e0813bf7d68969d951acafd5.tar.gz |
libx11: move xcms disabling to PACKAGECONFIG in libx11.inc
(From OE-Core rev: ea17d1365b0425b0f6ddd4daf8d166116ac26f26)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11.inc')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11.inc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index fb1daf2e0a..22b26cc277 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc | |||
@@ -9,7 +9,7 @@ require xorg-lib-common.inc | |||
9 | inherit siteinfo | 9 | inherit siteinfo |
10 | 10 | ||
11 | PE = "1" | 11 | PE = "1" |
12 | INC_PR = "r2" | 12 | INC_PR = "r3" |
13 | 13 | ||
14 | PROVIDES = "virtual/libx11" | 14 | PROVIDES = "virtual/libx11" |
15 | 15 | ||
@@ -23,6 +23,10 @@ FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/X | |||
23 | FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" | 23 | FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" |
24 | FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" | 24 | FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" |
25 | 25 | ||
26 | # Almost nothing uses XCMS | ||
27 | PACKAGECONFIG ??= "" | ||
28 | PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" | ||
29 | |||
26 | do_compile_prepend() { | 30 | do_compile_prepend() { |
27 | cd ${S}/src/util | 31 | cd ${S}/src/util |
28 | mv makekeys.c.orig makekeys.c || true | 32 | mv makekeys.c.orig makekeys.c || true |