diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-12-02 12:20:03 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-12-05 22:47:07 +0000 |
commit | a41df69a11a27ab67c0c6df08546f66ec3d83da6 (patch) | |
tree | 53aafb5376308d192991c56fb0d510dd2ba926cf /meta/recipes-graphics/mesa/mesa | |
parent | 13d011204a8711d3342b23a4c2a94307af84aeb9 (diff) | |
download | poky-a41df69a11a27ab67c0c6df08546f66ec3d83da6.tar.gz |
mesa-dri, mesa-xlib: fix compilation with x32 toolchain
Add support for building with x32 toolchain.
Simplified the use of SRC_URI & S vars across multiple files.
(From OE-Core rev: 145de26a7415357a08bcdbc0307b5a60e2ad1420)
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>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch b/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch new file mode 100644 index 0000000000..22a2339ad9 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | UpstreamStatus: Pending | ||
2 | |||
3 | get correct compiler options for x32 gcc. | ||
4 | |||
5 | Received this patch from H.J. Lu <hjl.tools@gmail.com> | ||
6 | |||
7 | Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/01 | ||
8 | |||
9 | --- Mesa-7.11/bin/mklib.x32 2011-11-30 14:29:14.976465283 -0800 | ||
10 | +++ Mesa-7.11/bin/mklib 2011-11-30 14:32:48.591525193 -0800 | ||
11 | @@ -335,7 +335,12 @@ case $ARCH in | ||
12 | set ${OBJECTS} | ||
13 | ABI32=`file $1 | grep 32-bit` | ||
14 | if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then | ||
15 | - OPTS="-m32 ${OPTS}" | ||
16 | + ABIX32=`file $1 | grep x86-64` | ||
17 | + if [ "${ABI32}" ]; then | ||
18 | + OPTS="-mx32 ${OPTS}" | ||
19 | + else | ||
20 | + OPTS="-m32 ${OPTS}" | ||
21 | + fi | ||
22 | fi | ||
23 | |||
24 | if [ "${ALTOPTS}" ] ; then | ||