aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-12-02 20:20:05 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-05 22:47:07 (GMT)
commitb60d604f233565edc47b9d132ce7141a4eeb17f9 (patch)
treeb1476f7101e318999eaccadd921ecd2f6d4fe6f2
parent89664754fb073f9be2ee2cfdaa0dbbe002ae561f (diff)
downloadpoky-b60d604f233565edc47b9d132ce7141a4eeb17f9.zip
poky-b60d604f233565edc47b9d132ce7141a4eeb17f9.tar.gz
poky-b60d604f233565edc47b9d132ce7141a4eeb17f9.tar.bz2
libxt: fix compilatoin with x32 toolchain
This fixes compilation with x32 toolchain. (From OE-Core rev: 22f487a089be2e1689e7137e4438f7b66c67984e) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: H.J. Lu <hjl.tools@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch19
-rw-r--r--meta/recipes-graphics/xorg-lib/libxt_1.1.1.bb4
2 files changed, 22 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch b/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch
new file mode 100644
index 0000000..57ddbeb
--- /dev/null
+++ b/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch
@@ -0,0 +1,19 @@
+UpstreamStatus: Pending
+
+This fixes compilation with x32 toolchain.
+
+Received this patch from H.J. Lu <hjl.tools@gmail.com>
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1
+
+
+--- libXt-1.1.1/include/X11/Xtos.h.x32 2011-02-08 07:56:40.000000000 -0800
++++ libXt-1.1.1/include/X11/Xtos.h 2011-11-30 17:19:27.473349770 -0800
+@@ -62,7 +62,7 @@ SOFTWARE.
+ defined(__sparc64__) || \
+ defined(__s390x__) || \
+ (defined(__hppa__) && defined(__LP64__)) || \
+- defined(__amd64__) || defined(amd64) || \
++ ((defined(__amd64__) || defined(amd64)) && defined(__LP64__)) || \
+ defined(__powerpc64__) || \
+ (defined(sgi) && (_MIPS_SZLONG == 64))
+ #define LONG64
diff --git a/meta/recipes-graphics/xorg-lib/libxt_1.1.1.bb b/meta/recipes-graphics/xorg-lib/libxt_1.1.1.bb
index 052431a..5475fc7 100644
--- a/meta/recipes-graphics/xorg-lib/libxt_1.1.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxt_1.1.1.bb
@@ -19,11 +19,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3239170e81427c5948287df07691f03f"
DEPENDS += "util-linux libxcb libsm virtual/libx11 kbproto libxdmcp"
PROVIDES = "xt"
-PR = "r0"
+PR = "r1"
PE = "1"
XORG_PN = "libXt"
+SRC_URI += "file://libxt_fix_for_x32.patch"
+
BBCLASSEXTEND = "native"
EXTRA_OECONF += "--disable-install-makestrs --disable-xkb"