diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-03 09:35:49 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-11 17:04:33 +0100 |
| commit | 70abb59e71a2aed5ef7faf5ba9b56f695d562382 (patch) | |
| tree | 36a746b6e788a334328c902fa5a0aaa56223c07f /meta/recipes-graphics/xorg-lib/libx11.inc | |
| parent | 60cfd59aab1362f02c5fb9124cd5554e96fb756d (diff) | |
| download | openembedded-core-contrib-70abb59e71a2aed5ef7faf5ba9b56f695d562382.tar.gz | |
libx11: package xcb, merge few changes from meta-oe
* move --with-keysymdef/--with-keysymdefdir setting to recipes (newer
versions are using keysymdefdir instead keysymdef
* fix MIN_REHASH in makekeys by sed call
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11.inc')
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11.inc | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index 455753f5db..748a48cef3 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -11,32 +11,39 @@ inherit siteinfo PROVIDES = "virtual/libx11" XORG_PN = "libX11" -LEAD_SONAME = "libX11.so" +LICENSE = "MIT & MIT-style & BSD" +LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" -EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h --disable-specs" +EXTRA_OECONF += "--with-groff=no --with-ps2pdf=no --with-fop=no --disable-specs" + +PACKAGES =+ "${PN}-xcb" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" +FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" -do_compile() { +do_compile_prepend() { cd ${S}/src/util mv makekeys.c.orig makekeys.c || true touch makekeys-makekeys.o ( unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + # MIN_REHASH 10 is only in 1.0.1 + sed -i -e 's:MIN_REHASH 10:MIN_REHASH 16:g' makekeys.c + sed -i -e 's:MIN_REHASH 15:MIN_REHASH 16:g' makekeys.c + touch makekeys-makekeys.o; if [ "${SITEINFO_BITS}" == "64" ]; then - ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys - else - ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -o makekeys - fi + ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys + else + ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -o makekeys + fi ) if [ "$?" != "0" ]; then exit 1 fi # mv to stop it getting rebuilt mv makekeys.c makekeys.c.orig - cd ${S} - oe_runmake + cd ../../ } # Multiple libx11 derivatives from from this file and are selected by virtual/libx11 |