From b0a4060d60ad35a511ede0ed3eb9781fc6ba2653 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Tue, 3 Jul 2012 11:46:01 +0300
Subject: [PATCH] Mesa: mklib: use our ar / gcc / g++. tryfix #890

---
 .../patches/Mesa-8.0.3-03_cross_compile.patch | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 packages/graphics/Mesa/patches/Mesa-8.0.3-03_cross_compile.patch

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
new file mode 100644
index 0000000000..58db199b7b
--- /dev/null
+++ b/packages/graphics/Mesa/patches/Mesa-8.0.3-03_cross_compile.patch
@@ -0,0 +1,36 @@
+diff --git a/bin/mklib b/bin/mklib
+index 9bac29e..b8fac2c 100755
+--- a/bin/mklib
++++ b/bin/mklib
+@@ -49,8 +49,8 @@ expand_archives() {
+                     /*) ;;
+                     *)  FILE="$ORIG_DIR/$FILE" ;;
+                 esac
+-                MEMBERS=`ar t $FILE`
+-                ar x $FILE
++                MEMBERS=`$AR t $FILE`
++                $AR x $FILE
+                 for MEMBER in $MEMBERS ; do
+                     NEWFILES="$NEWFILES $DIR/$MEMBER"
+                 done
+@@ -87,7 +87,7 @@ make_ar_static_lib() {
+     rm -f ${LIBNAME}
+ 
+     # make static lib
+-    ar ${OPTS} ${LIBNAME} ${OBJECTS}
++    $AR ${OPTS} ${LIBNAME} ${OBJECTS}
+ 
+     # run ranlib
+     if [ ${RANLIB} = 1 ] ; then
+@@ -313,9 +313,9 @@ case $ARCH in
+ 	if [ "x$LINK" = "x" ] ; then
+ 	    # -linker was not specified so set default link command now
+             if [ $CPLUSPLUS = 1 ] ; then
+-                LINK=g++
++                LINK=$CXX
+             else
+-                LINK=gcc
++                LINK=$CC
+             fi
+ 	fi
+