From 0eea9ab2e9d6e9457f24aa63b3126666611c1c7b Mon Sep 17 00:00:00 2001 From: Jingdong Lu Date: Tue, 24 May 2011 13:57:57 +0800 Subject: libx11: fix libX11 keysyms to pass xts5 of lsb Fixes bug: [YOCTO #1095] Because of cross-compiling libx11 keysyms will cause Xts5 test of LSB fail. libx11 use a tool named "makekey" which compiled as a native tool to generate ks_tables.h. Because the size of "unsigned long" is different between 32-bit and 64-bit, we should judge whether our target is 32-bit or 64-bit and tell "makekey". I add a patch to "makekeys_crosscompile.patch" to "src/utils/makekeys.c" in order to deal with the different targets. If our target is 32-bit, we force the variable its type is "unsigned long" to "uint32_t". So we can generate a correct keysyms. Signed-off-by: Jingdong Lu --- meta/recipes-graphics/xorg-lib/libx11.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'meta/recipes-graphics/xorg-lib/libx11.inc') diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index 030b0dbc5..c156ce6dc 100644 --- a/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/meta/recipes-graphics/xorg-lib/libx11.inc @@ -6,6 +6,8 @@ basic functions of the window system." require xorg-lib-common.inc +inherit siteinfo + PROVIDES = "virtual/libx11" XORG_PN = "libX11" @@ -22,7 +24,11 @@ do_compile() { touch makekeys-makekeys.o ( unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS - ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys + 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 ) if [ "$?" != "0" ]; then exit 1 -- cgit v1.2.3