Mesa: mklib: use our ar / gcc / g++. tryfix #890

2025-07-24 11:16:51 +00:00 · 2012-07-03 11:46:01 +03:00 · 2012-07-03 11:46:01 +03:00 · b0a4060d60
commit b0a4060d60
parent 65b8a77807
1 changed files with 36 additions and 0 deletions
--- 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
@ -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
+