patch-bin_mklib 1.1 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546
  1. --- Mesa-7.8.2.orig/bin/mklib 2010-06-15 19:43:41.000000000 +0200
  2. +++ Mesa-7.8.2/bin/mklib 2010-12-04 23:25:12.000000000 +0100
  3. @@ -49,8 +49,8 @@ expand_archives() {
  4. /*) ;;
  5. *) FILE="$ORIG_DIR/$FILE" ;;
  6. esac
  7. - MEMBERS=`ar t $FILE`
  8. - ar x $FILE
  9. + MEMBERS=`${AR} t $FILE`
  10. + ${AR} x $FILE
  11. for MEMBER in $MEMBERS ; do
  12. NEWFILES="$NEWFILES $DIR/$MEMBER"
  13. done
  14. @@ -77,7 +77,7 @@ expand_archives() {
  15. make_ar_static_lib() {
  16. OPTS=$1
  17. shift;
  18. - RANLIB=$1
  19. + RAN=$1
  20. shift;
  21. LIBNAME=$1
  22. shift;
  23. @@ -87,11 +87,11 @@ make_ar_static_lib() {
  24. rm -f ${LIBNAME}
  25. # make static lib
  26. - ar ${OPTS} ${LIBNAME} ${OBJECTS}
  27. + ${AR} ${OPTS} ${LIBNAME} ${OBJECTS}
  28. # run ranlib
  29. - if [ ${RANLIB} = 1 ] ; then
  30. - ranlib ${LIBNAME}
  31. + if [ ${RAN} = 1 ] ; then
  32. + ${RANLIB} ${LIBNAME}
  33. fi
  34. echo ${LIBNAME}
  35. @@ -251,7 +251,7 @@ OBJECTS=$@
  36. if [ ${ARCH} = "auto" ] ; then
  37. - ARCH=`uname`
  38. + ARCH=Linux
  39. fi