mesa: Fix mklibs patch to simply remove troublesome uname usage

Without this we started seeing the -mx32 flag being passed to the compiler
for things like arm builds which makes no sense.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/mesa/mesa-common.inc b/meta/recipes-graphics/mesa/mesa-common.inc
index 2b90aed2121e63c5cc68cd3bbc9ae60f14e6302b..1c376b7733470db52fd96aebec0b9a50d396fc14 100644 (file)
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,7 +12,7 @@ SECTION = "x11"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://docs/license.html;md5=7a3373c039b6b925c427755a4f779c1d"
 
-INC_PR = "r13"
+INC_PR = "r14"
 PE = "2"
 
 

diff --git a/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch b/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch
index 8994faf15411c6d1366568d5eb95c3c46a19ea04..f072c34f7116fe725e398590b0788d5b154a0939 100644 (file)
--- a/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch
+++ b/meta/recipes-graphics/mesa/mesa/mesa_fix_for_x32.patch
@@ -1,38 +1,40 @@
 Upstream-Status: Pending
 
-get correct compiler options for x32 gcc.
+Using uname like this when cross compiling is a really bad idea. We 
+provide the correct linker flags, lets just assume we can get this 
+right ourselves.
 
-Received this patch from H.J. Lu <hjl.tools@gmail.com>
+RP 2012/04/26
 
-Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/06
-
---- Mesa-7.11/bin/mklib.x32    2011-12-06 13:15:17.968695114 -0800
-+++ Mesa-7.11/bin/mklib        2011-12-06 13:17:13.872152249 -0800
-@@ -335,7 +335,12 @@ case $ARCH in
+Index: Mesa-7.11/bin/mklib
+===================================================================
+--- Mesa-7.11.orig/bin/mklib   2012-04-26 19:43:20.729150109 +0000
++++ Mesa-7.11/bin/mklib        2012-04-26 20:30:22.421086163 +0000
+@@ -330,13 +330,7 @@
+           ;;
+           esac
+ 
+-          # Check if objects are 32-bit and we're running in 64-bit
+-          # environment.  If so, pass -m32 flag to linker.
            set ${OBJECTS}
-           ABI32=`file $1 | grep 32-bit`
-           if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+-          ABI32=`file $1 | grep 32-bit`
+-          if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
 -              OPTS="-m32 ${OPTS}"
-+              ABIX32=`file $1 | grep x86-64`
-+              if [ "${ABI32}" ]; then
-+                  OPTS="-mx32 ${OPTS}"
-+              else
-+                  OPTS="-m32 ${OPTS}"
-+              fi
-           fi
+-          fi
  
              if [ "${ALTOPTS}" ] ; then
-@@ -392,7 +397,12 @@ case $ARCH in
+                 OPTS=${ALTOPTS}
+@@ -387,13 +381,7 @@
+               # exptmp is removed below
+           fi
+ 
+-          # Check if objects are 32-bit and we're running in 64-bit
+-          # environment.  If so, pass -m32 flag to linker.
            set ${OBJECTS}
-           ABI32=`file $1 | grep 32-bit`
-           if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+-          ABI32=`file $1 | grep 32-bit`
+-          if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
 -              OPTS="-m32 ${OPTS}"
-+              ABIX32=`file $1 | grep x86-64`
-+              if [ "${ABI32}" ]; then
-+                  OPTS="-mx32 ${OPTS}"
-+              else
-+                  OPTS="-m32 ${OPTS}"
-+              fi
-           fi
+-          fi
              if [ "${ALTOPTS}" ] ; then
                  OPTS=${ALTOPTS}
+             fi