From fb9b8c1d732d2288a7b298a4e964bcfaafeb5546 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Fri, 6 Jul 2012 11:09:49 +0300
Subject: [PATCH] Mesa: update crosscompile patch. closes #890

---
 .../patches/Mesa-8.0.3-03_cross_compile.patch | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/packages/graphics/Mesa/patches/Mesa-8.0.3-03_cross_compile.patch b/packages/graphics/Mesa/patches/Mesa-8.0.3-03_cross_compile.patch
index 58db199b7b..8e6231bb91 100644
--- a/packages/graphics/Mesa/patches/Mesa-8.0.3-03_cross_compile.patch
+++ b/packages/graphics/Mesa/patches/Mesa-8.0.3-03_cross_compile.patch
@@ -1,5 +1,5 @@
 diff --git a/bin/mklib b/bin/mklib
-index 9bac29e..b8fac2c 100755
+index 9bac29e..70982d6 100755
 --- a/bin/mklib
 +++ b/bin/mklib
 @@ -49,8 +49,8 @@ expand_archives() {
@@ -13,18 +13,33 @@ index 9bac29e..b8fac2c 100755
                  for MEMBER in $MEMBERS ; do
                      NEWFILES="$NEWFILES $DIR/$MEMBER"
                  done
-@@ -87,7 +87,7 @@ make_ar_static_lib() {
+@@ -77,7 +77,7 @@ expand_archives() {
+ make_ar_static_lib() {
+     OPTS=$1
+     shift;
+-    RANLIB=$1
++    _RANLIB=$1
+     shift;
+     LIBNAME=$1
+     shift;
+@@ -87,11 +87,11 @@ make_ar_static_lib() {
      rm -f ${LIBNAME}
- 
+
      # make static lib
 -    ar ${OPTS} ${LIBNAME} ${OBJECTS}
 +    $AR ${OPTS} ${LIBNAME} ${OBJECTS}
- 
+
      # run ranlib
-     if [ ${RANLIB} = 1 ] ; then
+-    if [ ${RANLIB} = 1 ] ; then
+-        ranlib ${LIBNAME}
++    if [ ${_RANLIB} = 1 ] ; then
++        $RANLIB ${LIBNAME}
+     fi
+
+     echo ${LIBNAME}
 @@ -313,9 +313,9 @@ case $ARCH in
- 	if [ "x$LINK" = "x" ] ; then
- 	    # -linker was not specified so set default link command now
+        if [ "x$LINK" = "x" ] ; then
+            # -linker was not specified so set default link command now
              if [ $CPLUSPLUS = 1 ] ; then
 -                LINK=g++
 +                LINK=$CXX
@@ -32,5 +47,4 @@ index 9bac29e..b8fac2c 100755
 -                LINK=gcc
 +                LINK=$CC
              fi
- 	fi
- 
+        fi