summaryrefslogtreecommitdiff
path: root/package/MesaLib/patches/patch-bin_mklib
diff options
context:
space:
mode:
Diffstat (limited to 'package/MesaLib/patches/patch-bin_mklib')
-rw-r--r--package/MesaLib/patches/patch-bin_mklib19
1 files changed, 12 insertions, 7 deletions
diff --git a/package/MesaLib/patches/patch-bin_mklib b/package/MesaLib/patches/patch-bin_mklib
index 6882933fb..2f53c152c 100644
--- a/package/MesaLib/patches/patch-bin_mklib
+++ b/package/MesaLib/patches/patch-bin_mklib
@@ -1,28 +1,33 @@
---- Mesa-7.8.2.orig/bin/mklib 2010-06-15 19:43:41.000000000 +0200
-+++ Mesa-7.8.2/bin/mklib 2013-02-12 13:27:53.000000000 +0100
-@@ -333,10 +333,6 @@ case $ARCH in
+diff -Nur Mesa-8.0.5.orig/bin/mklib Mesa-8.0.5/bin/mklib
+--- Mesa-8.0.5.orig/bin/mklib 2012-10-24 21:03:58.000000000 +0200
++++ Mesa-8.0.5/bin/mklib 2013-04-30 13:06:28.000000000 +0200
+@@ -333,12 +333,6 @@
# 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
+- ARM=`file $1 | grep ARM`
+- # Do not add "-m32" option for arm.
+- if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then
- OPTS="-m32 ${OPTS}"
- fi
if [ "${ALTOPTS}" ] ; then
OPTS=${ALTOPTS}
-@@ -390,10 +386,6 @@ case $ARCH in
+@@ -392,12 +386,6 @@
# 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
+- ARM=`file $1 | grep ARM`
+- # Do not add "-m32" option for arm.
+- if [ -z "$ARM" -a "${ABI32}" -a `uname -m` = "x86_64" ] ; then
- OPTS="-m32 ${OPTS}"
- fi
if [ "${ALTOPTS}" ] ; then
OPTS=${ALTOPTS}
fi
-@@ -462,12 +454,6 @@ case $ARCH in
+@@ -466,12 +454,6 @@
# Check if objects are 32-bit and we're running in 64-bit
# environment. If so, pass -m32 flag to linker.
set ${OBJECTS}