From patchwork Fri Dec 2 20:20:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [07/11] libxt: fix compilatoin with x32 toolchain Date: Fri, 02 Dec 2011 20:20:05 -0000 From: Nitin A Kamble X-Patchwork-Id: 16135 Message-Id: To: hjl.tools@gmail.com, openembedded-core@lists.openembedded.org From: Nitin A Kamble This fixes compilation with x32 toolchain. Signed-off-by: Nitin A Kamble Signed-off-by: H.J. Lu --- .../xorg-lib/libxt/libxt_fix_for_x32.patch | 19 +++++++++++++++++++ meta/recipes-graphics/xorg-lib/libxt_1.1.1.bb | 4 +++- 2 files changed, 22 insertions(+), 1 deletions(-) create mode 100644 meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch 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 +Signed-Off-By: Nitin A Kamble 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"