summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-12-02 12:20:07 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-05 22:47:07 +0000
commita3cd4f5ee490d50d0e1c28cdb2c23ef95361b1d1 (patch)
tree643188b7b537db12a934853cf4b4eb85191b0afb /meta
parentf3c0a02b920efa5747474b4c65aba12a928e56de (diff)
downloadpoky-a3cd4f5ee490d50d0e1c28cdb2c23ef95361b1d1.tar.gz
xproto: fix compilation with x32 toolchain
Don't always define LONG64 for AMD64 X32 defines __amd64__/amd64 with 32bit long. We should simply check __LP64__ before defining LONG64 without checking __amd64__/amd64. This fixes compilation with x32 toolchain. Signed-Off-By: H.J. Lu <hjl.tools@gmail.com> Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1 (From OE-Core rev: 3678341326ca1011c3b61d29cb21ed67cda04b88) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch22
-rw-r--r--meta/recipes-graphics/xorg-proto/xproto_7.0.22.bb4
2 files changed, 25 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch b/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch
new file mode 100644
index 0000000000..c9fbb6fce6
--- /dev/null
+++ b/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch
@@ -0,0 +1,22 @@
1UpstreamStatus: Pending
2
3Don't always define LONG64 for AMD64
4
5X32 defines __amd64__/amd64 with 32bit long. We should simply check
6__LP64__ before defining LONG64 without checking __amd64__/amd64.
7
8This fixes compilation with x32 toolchain.
9
10Received this patch from H.J. Lu <hjl.tools@gmail.com>
11Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1
12
13--- xproto-7.0.22/Xmd.h.x32 2009-07-11 04:19:50.000000000 -0700
14+++ xproto-7.0.22/Xmd.h 2011-11-30 17:14:19.290395893 -0800
15@@ -62,7 +62,6 @@ SOFTWARE.
16 defined(__ia64__) || defined(ia64) || \
17 defined(__sparc64__) || \
18 defined(__s390x__) || \
19- defined(__amd64__) || defined(amd64) || \
20 defined(__powerpc64__)
21 # define LONG64 /* 32/64-bit architecture */
22 # endif
diff --git a/meta/recipes-graphics/xorg-proto/xproto_7.0.22.bb b/meta/recipes-graphics/xorg-proto/xproto_7.0.22.bb
index 54f8482dce..8f763142ae 100644
--- a/meta/recipes-graphics/xorg-proto/xproto_7.0.22.bb
+++ b/meta/recipes-graphics/xorg-proto/xproto_7.0.22.bb
@@ -8,9 +8,11 @@ System."
8LICENSE = "MIT & MIT-style" 8LICENSE = "MIT & MIT-style"
9LIC_FILES_CHKSUM = "file://COPYING;md5=b9e051107d5628966739a0b2e9b32676" 9LIC_FILES_CHKSUM = "file://COPYING;md5=b9e051107d5628966739a0b2e9b32676"
10 10
11PR = "r0" 11PR = "r1"
12PE = "1" 12PE = "1"
13 13
14SRC_URI += "file://xproto_fix_for_x32.patch"
15
14EXTRA_OECONF_append = " --enable-specs=no" 16EXTRA_OECONF_append = " --enable-specs=no"
15BBCLASSEXTEND = "native nativesdk" 17BBCLASSEXTEND = "native nativesdk"
16 18