93 lines
2.6 KiB
Diff
93 lines
2.6 KiB
Diff
diff -rup sg3_utils-1.38.orig/aclocal.m4 sg3_utils-1.38/aclocal.m4
|
|
--- sg3_utils-1.38.orig/aclocal.m4 2013-10-31 16:01:34.000000000 +0100
|
|
+++ sg3_utils-1.38/aclocal.m4 2014-04-18 15:13:20.000000000 +0200
|
|
@@ -1326,7 +1326,7 @@ ia64-*-hpux*)
|
|
rm -rf conftest*
|
|
;;
|
|
|
|
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
|
|
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
|
|
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
|
# Find out which ABI we are using.
|
|
echo 'int i;' > conftest.$ac_ext
|
|
@@ -1338,16 +1338,12 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
|
|
LD="${LD-ld} -m elf_i386_fbsd"
|
|
;;
|
|
x86_64-*linux*)
|
|
- case `/usr/bin/file conftest.o` in
|
|
- *x86-64*)
|
|
- LD="${LD-ld} -m elf32_x86_64"
|
|
- ;;
|
|
- *)
|
|
- LD="${LD-ld} -m elf_i386"
|
|
- ;;
|
|
- esac
|
|
+ LD="${LD-ld} -m elf_i386"
|
|
+ ;;
|
|
+ powerpc64le-*linux*)
|
|
+ LD="${LD-ld} -m elf32lppclinux"
|
|
;;
|
|
- ppc64-*linux*|powerpc64-*linux*)
|
|
+ powerpc64-*linux*)
|
|
LD="${LD-ld} -m elf32ppclinux"
|
|
;;
|
|
s390x-*linux*)
|
|
@@ -1366,7 +1362,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
|
|
x86_64-*linux*)
|
|
LD="${LD-ld} -m elf_x86_64"
|
|
;;
|
|
- ppc*-*linux*|powerpc*-*linux*)
|
|
+ powerpcle-*linux*)
|
|
+ LD="${LD-ld} -m elf64lppc"
|
|
+ ;;
|
|
+ powerpc-*linux*)
|
|
LD="${LD-ld} -m elf64ppc"
|
|
;;
|
|
s390*-*linux*|s390*-*tpf*)
|
|
diff -rup sg3_utils-1.38.orig/configure sg3_utils-1.38/configure
|
|
--- sg3_utils-1.38.orig/configure 2013-10-31 16:01:34.000000000 +0100
|
|
+++ sg3_utils-1.38/configure 2014-04-18 15:13:21.000000000 +0200
|
|
@@ -6122,7 +6125,7 @@ ia64-*-hpux*)
|
|
rm -rf conftest*
|
|
;;
|
|
|
|
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
|
|
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
|
|
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
|
# Find out which ABI we are using.
|
|
echo 'int i;' > conftest.$ac_ext
|
|
@@ -6138,16 +6141,12 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
|
|
LD="${LD-ld} -m elf_i386_fbsd"
|
|
;;
|
|
x86_64-*linux*)
|
|
- case `/usr/bin/file conftest.o` in
|
|
- *x86-64*)
|
|
- LD="${LD-ld} -m elf32_x86_64"
|
|
- ;;
|
|
- *)
|
|
- LD="${LD-ld} -m elf_i386"
|
|
- ;;
|
|
- esac
|
|
+ LD="${LD-ld} -m elf_i386"
|
|
;;
|
|
- ppc64-*linux*|powerpc64-*linux*)
|
|
+ powerpc64le-*linux*)
|
|
+ LD="${LD-ld} -m elf32lppclinux"
|
|
+ ;;
|
|
+ powerpc64-*linux*)
|
|
LD="${LD-ld} -m elf32ppclinux"
|
|
;;
|
|
s390x-*linux*)
|
|
@@ -6166,7 +6165,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
|
|
x86_64-*linux*)
|
|
LD="${LD-ld} -m elf_x86_64"
|
|
;;
|
|
- ppc*-*linux*|powerpc*-*linux*)
|
|
+ powerpcle-*linux*)
|
|
+ LD="${LD-ld} -m elf64lppc"
|
|
+ ;;
|
|
+ powerpc-*linux*)
|
|
LD="${LD-ld} -m elf64ppc"
|
|
;;
|
|
s390*-*linux*|s390*-*tpf*)
|