6f9fbfdd7f
In4268d39, a patch was added to update libtool.m4 for MIPS n64 targets. However, this caused the configure script to be regenerated during the build steps, which in turn caused build failures on Fedora 12 hosts. Ined73d1d, this was fixed by patching the installed libtool.m4 file instead of the source file. However,ed73d1ddid not take into account that the target libtool will also install libtool.m4 to staging, and that that version has precedence over the one in HOST_DIR. Therefore, this patch takes a different approach: the source file is patched in the usual way, and instead the reconfigure is avoided by touching the generated files. On the target, we also cannot use the AUTORECONF mechanism because of some mysterious Makefile.inc file. So just use the same approach and wait for upstream to make a new release. Fixes: http://autobuild.buildroot.net/results/b86/b86a83c6549004f226e7255242e54ef4e50c5ec3/ Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
sets correct linker ABI flags on MIPS64
|
|
http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=5f7f7d9615bf650cf99d581a33b3e18357f79951
|
|
|
|
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
|
|
|
diff -ru libtool-2.4.2.orig/libltdl/m4/libtool.m4 libtool-2.4.2/libltdl/m4/libtool.m4
|
|
--- libtool-2.4.2.orig/libltdl/m4/libtool.m4 2013-11-11 11:44:30.419396295 +0000
|
|
+++ libtool-2.4.2/libltdl/m4/libtool.m4 2013-11-11 11:44:07.055032308 +0000
|
|
@@ -1312,6 +1312,38 @@
|
|
rm -rf conftest*
|
|
;;
|
|
|
|
+mips64*-*linux*)
|
|
+ # Find out what ABI is being produced by ac_compile, and set linker
|
|
+ # options accordingly.
|
|
+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
|
|
+ if AC_TRY_EVAL(ac_compile); then
|
|
+ emul=elf
|
|
+ case `/usr/bin/file conftest.$ac_objext` in
|
|
+ *32-bit*)
|
|
+ emul="${emul}32"
|
|
+ ;;
|
|
+ *64-bit*)
|
|
+ emul="${emul}64"
|
|
+ ;;
|
|
+ esac
|
|
+ case `/usr/bin/file conftest.$ac_objext` in
|
|
+ *MSB*)
|
|
+ emul="${emul}btsmip"
|
|
+ ;;
|
|
+ *LSB*)
|
|
+ emul="${emul}ltsmip"
|
|
+ ;;
|
|
+ esac
|
|
+ case `/usr/bin/file conftest.$ac_objext` in
|
|
+ *N32*)
|
|
+ emul="${emul}n32"
|
|
+ ;;
|
|
+ esac
|
|
+ LD="${LD-ld} -m $emul"
|
|
+ fi
|
|
+ rm -rf conftest*
|
|
+ ;;
|
|
+
|
|
x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
|
|
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
|
|
# Find out which ABI we are using.
|