diff options
| author |   Jingdong Lu <jingdong.lu@windriver.com> | 2011-05-24 13:57:57 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-02 14:47:26 +0100 |
| commit | 0eea9ab2e9d6e9457f24aa63b3126666611c1c7b (patch) | |
| tree | 158b44df5ae0e89bbd992424b9c3de73fca1e3e5 /meta/recipes-graphics/xorg-lib/libx11.inc | |
| parent | 39a3842c34cf344749d7269a91c47e3a1a86d2b8 (diff) | |
| download | openembedded-core-0eea9ab2e9d6e9457f24aa63b3126666611c1c7b.tar.gz | |
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 <jingdong.lu@windriver.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib/libx11.inc')
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libx11.inc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc index 030b0dbc5d..c156ce6dcb 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 |