diff options
| author |   Ross Burton <ross.burton@intel.com> | 2012-09-11 20:18:06 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-12 14:53:59 +0100 |
| commit | 04c776956b98cc96c2c1a139bec0422feae1497d (patch) | |
| tree | 01232dcdbabd844ba78fc86bba9e2f3ce729dd08 /meta/recipes-graphics/xorg-lib/libx11.inc | |
| parent | 6169ed981b1c8fe26a5238bb9837c21d284df729 (diff) | |
| download | openembedded-core-04c776956b98cc96c2c1a139bec0422feae1497d.tar.gz | |
libx11: makekeys can be cross-compiled now, so don't hack around
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 | 43 |
1 files changed, 13 insertions, 30 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index d56aa23918..3ecd9e50b3 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -11,7 +11,7 @@ inherit siteinfo FILESPATH = "${FILE_DIRNAME}/libx11" PE = "1" -INC_PR = "r7" +INC_PR = "r8" PROVIDES = "virtual/libx11" @@ -22,12 +22,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto" DEPENDS += "xproto-native" -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" - EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/" # Let people with incredibly archaic requirements enable Xcms and BigFont, but @@ -36,29 +30,18 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[xcms] = "--enable-xcms,--disable-xcms" PACKAGECONFIG[bigfont] = "--enable-xf86bigfont,--disable-xf86bigfont,xf86bigfontproto" -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 -I${S}/include -o makekeys - else - ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} -DUSE32 makekeys.c -I${S}/include -o makekeys - fi - ) - if [ "$?" != "0" ]; then - exit 1 - fi - # mv to stop it getting rebuilt - mv makekeys.c makekeys.c.orig - cd ../../ -} +# src/util/makekeys needs to be compiled natively, so tell it what compiler to +# use. +export CC_FOR_BUILD = "${BUILD_CC}" +export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" +export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" +export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}" + +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" # 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. |