diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-05 10:49:13 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-05 10:49:13 +0100 |
| commit | 26d79f5e76b17c978ee4b21e17464ea9ea2e0203 (patch) | |
| tree | dd856982dccb6e46240112775ade21247d627c6a /package/MesaLib/patches/patch-bin_mklib | |
| parent | 9037fba3edd4bffd403b342a1487d9bf59f25830 (diff) | |
| parent | 4c93c2e27f98e0c00a101bc8b7df20b12d82f8b9 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/MesaLib/patches/patch-bin_mklib')
| -rw-r--r-- | package/MesaLib/patches/patch-bin_mklib | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/package/MesaLib/patches/patch-bin_mklib b/package/MesaLib/patches/patch-bin_mklib index 159aba578..f198b424d 100644 --- a/package/MesaLib/patches/patch-bin_mklib +++ b/package/MesaLib/patches/patch-bin_mklib @@ -1,5 +1,40 @@ --- Mesa-7.8.2.orig/bin/mklib 2010-06-15 19:43:41.000000000 +0200 -+++ Mesa-7.8.2/bin/mklib 2010-10-11 20:40:45.000000000 +0200 ++++ Mesa-7.8.2/bin/mklib 2010-12-04 23:25:12.000000000 +0100 +@@ -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 +@@ -77,7 +77,7 @@ expand_archives() { + make_ar_static_lib() { + OPTS=$1 + shift; +- RANLIB=$1 ++ RAN=$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 +- ranlib ${LIBNAME} ++ if [ ${RAN} = 1 ] ; then ++ ${RANLIB} ${LIBNAME} + fi + + echo ${LIBNAME} @@ -251,7 +251,7 @@ OBJECTS=$@ |