sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Ross Burton 2012-09-11 20:17:55 +01:00 committed by Richard Purdie
parent 85816c84eb
commit c0fff56ef0
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-graphics/xorg-lib/libx11-diet_1.5.0.bb
View File

@ -25,6 +25,6 @@ DEPENDS += "libxcb bigreqsproto xproto xextproto xtrans libxau xcmiscproto \
FILESDIR = "${@os.path.dirname(d.getVar('FILE', True))}/libx11"
EXTRA_OECONF += "--disable-xcms --disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11"
EXTRA_OECONF += "--disable-xlocale --with-keysymdefdir=${STAGING_INCDIR}/X11"
CFLAGS += "-D_GNU_SOURCE"

2
meta/recipes-graphics/xorg-lib/libx11-trim_1.5.0.bb
View File

@ -19,4 +19,4 @@ RPROVIDES_${PN}-locale = "libx11-locale"
SRC_URI[md5sum] = "78b4b3bab4acbdf0abcfca30a8c70cc6"
SRC_URI[sha256sum] = "c382efd7e92bfc3cef39a4b7f1ecf2744ba4414a705e3bc1e697f75502bd4d86"
EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xcms "
EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/"

6
meta/recipes-graphics/xorg-lib/libx11.inc
View File

@ -9,7 +9,7 @@ require xorg-lib-common.inc
inherit siteinfo
PE = "1"
INC_PR = "r2"
INC_PR = "r3"
PROVIDES = "virtual/libx11"
@ -23,6 +23,10 @@ FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/X
FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*"
FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale"
# Almost nothing uses XCMS
PACKAGECONFIG ??= ""
PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms"
do_compile_prepend() {
cd ${S}/src/util
mv makekeys.c.orig makekeys.c || true