blob: f198b424da843969a9041235e8e3f321c52be97f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
--- Mesa-7.8.2.orig/bin/mklib 2010-06-15 19:43:41.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=$@
if [ ${ARCH} = "auto" ] ; then
- ARCH=`uname`
+ ARCH=Linux
fi
|
