diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-02-18 14:07:01 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-02-18 14:07:01 +0100 |
| commit | 8d84c5e5cbf61e156ff29ddd44eb7e850686b706 (patch) | |
| tree | a20ea49331b2305cff63c20a2136749b9bb45a48 /package/MesaLib | |
| parent | 19677ae003abec9c066b05a319d69c4b461693dc (diff) | |
mips64 fixes
Diffstat (limited to 'package/MesaLib')
| -rw-r--r-- | package/MesaLib/patches/patch-bin_mklib | 77 |
1 files changed, 34 insertions, 43 deletions
diff --git a/package/MesaLib/patches/patch-bin_mklib b/package/MesaLib/patches/patch-bin_mklib index f198b424d..6882933fb 100644 --- a/package/MesaLib/patches/patch-bin_mklib +++ b/package/MesaLib/patches/patch-bin_mklib @@ -1,46 +1,37 @@ --- 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 ++++ Mesa-7.8.2/bin/mklib 2013-02-12 13:27:53.000000000 +0100 +@@ -333,10 +333,6 @@ case $ARCH in + # Check if objects are 32-bit and we're running in 64-bit + # environment. If so, pass -m32 flag to linker. + set ${OBJECTS} +- ABI32=`file $1 | grep 32-bit` +- if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then +- OPTS="-m32 ${OPTS}" +- fi + if [ "${ALTOPTS}" ] ; then + OPTS=${ALTOPTS} +@@ -390,10 +386,6 @@ case $ARCH in + # Check if objects are 32-bit and we're running in 64-bit + # environment. If so, pass -m32 flag to linker. + set ${OBJECTS} +- ABI32=`file $1 | grep 32-bit` +- if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then +- OPTS="-m32 ${OPTS}" +- fi + if [ "${ALTOPTS}" ] ; then + OPTS=${ALTOPTS} + fi +@@ -462,12 +454,6 @@ case $ARCH in + # Check if objects are 32-bit and we're running in 64-bit + # environment. If so, pass -m32 flag to linker. + set ${OBJECTS} +- ABI32=`file $1 | grep 32-bit` +- if [ "${ABI32}" ] ; then +- OPTS="-m32 -shared -Wl,-Bdynamic" +- else +- OPTS="-m64 -shared -Wl,-Bdynamic" +- fi + fi + # If using Sun C++ compiler, need to tell it not to add runpaths |