From: Xiaofeng Yan <[email protected]>

LSB 4.1 complain a host contamination error from libx11 because of absent
patch "makekeys_crosscompile.patch" from libx11-trim-1.4.4.

[YOCTO #1970]

Signed-off-by: Xiaofeng Yan <[email protected]>
---
 .../libx11-1.4.4/makekeys_crosscompile.patch       |   45 ++++++++++++++++++++
 1 files changed, 45 insertions(+), 0 deletions(-)
 create mode 100644 
meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch

diff --git 
a/meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch 
b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch
new file mode 100644
index 0000000..e5eacf0
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libx11-1.4.4/makekeys_crosscompile.patch
@@ -0,0 +1,45 @@
+Because the size of "unsigned long" is different between 32-bit
+and 64-bit, judge whether target is 32-bit or 64-bit and tell
+"makekey". 
+
+Upstream-Status: Pending
+
+Signed-off-by: [email protected]
+
+--- libX11-1.3.4.orig/src/util/makekeys.c      2010-01-15 09:11:36.000000000 
+0800
++++ libX11-1.3.4/src/util/makekeys.c   2011-05-24 19:04:25.454774908 +0800
+@@ -33,6 +33,7 @@
+ #include <X11/keysymdef.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ 
+ typedef unsigned long Signature;
+ 
+@@ -124,7 +125,12 @@
+           name = info[i].name;
+           sig = 0;
+           while ((c = *name++))
+-              sig = (sig << 1) + c;
++#ifdef USE32
++              sig = (uint32_t)(sig << 1) + c;
++#else
++              sig = (uint64_t)(sig << 1) + c;
++#endif
++              
+           first = j = sig % z;
+           for (k = 0; tab[j]; k++) {
+               j += first + 1;
+@@ -163,7 +169,11 @@
+       name = info[i].name;
+       sig = 0;
+       while ((c = *name++))
+-          sig = (sig << 1) + c;
++#ifdef USE32
++          sig = (uint32_t)(sig << 1) + c;
++#else
++          sig = (uint64_t)(sig << 1) + c;
++#endif
+       first = j = sig % z;
+       while (offsets[j]) {
+           j += first + 1;
-- 
1.7.0.4


_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Reply via email to