Skip to contentSkip to conversation

libtool: Apply upstream patch to set correct linkage on

PATCH Superseded Vicente Olivert Riera 2 participants 3 messages Nov 18, 2013 – Nov 30, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 libtool: Apply upstream patch to set correct linkage on

This libtool change ensures that ld uses the right machine emulation file, which will allow to fix several MIPS64 n64 link failures, such as the one currently visible on the libiscsi package. Packages affected by this problem will have to use <pkg>_AUTORECONF = YES to benefit from this libtool fix, until they are fixed upstream.

---
 .../libtool/libtool-0001-mips64-n64-linking.patch  |   47 ++++++++++++++++++++
 1 files changed, 47 insertions(+), 0 deletions(-)
 create mode 100644 package/libtool/libtool-0001-mips64-n64-linking.patch
package/libtool/libtool-0001-mips64-n64-linking.patch new file +47 -0
new file mode 100644
index 0000000..ef9084d
@@ -0,0 +1,47 @@
+sets correct linker ABI flags on MIPS64
+http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=5f7f7d9615bf650cf99d581a33b3e18357f79951
+
+Signed-off-by: Vicente Olivert Riera <[email protected]>
+
+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.
Signature · 1 line
1.7.1
#1 lore raw

PATCH v2 1/1 libtool: Apply upstream patch to set correct linkage on

Quoted 57 lines · Vicente Olivert Riera

This libtool change ensures that ld uses the right machine emulation file, which will allow to fix several MIPS64 n64 link failures, such as the one currently visible on the libiscsi package. Packages affected by this problem will have to use <pkg>_AUTORECONF = YES to benefit from this libtool fix, until they are fixed upstream.

---
  .../libtool/libtool-0001-mips64-n64-linking.patch  |   47 ++++++++++++++++++++
  1 files changed, 47 insertions(+), 0 deletions(-)

create mode 100644 package/libtool/libtool-0001-mips64-n64-linking.patch

package/libtool/libtool-0001-mips64-n64-linking.patch new file +37 -0
new file mode 100644
index 0000000..ef9084d
@@ -0,0 +1,47 @@
+sets correct linker ABI flags on MIPS64
+http://git.savannah.gnu.org/cgit/libtool.git/commit/?id=5f7f7d9615bf650cf99d581a33b3e18357f79951
+
+Signed-off-by: Vicente Olivert Riera <[email protected]>
+
+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"

package/libtool/libtool-0001-mips64-n64-linking.patch line 47

Quoted 10 lines
package/libtool/libtool-0001-mips64-n64-linking.patch new file +10 -0
++      ;;
++    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.

The email subject should be changed to "libtool: Apply upstream patch to set correct linkage on MIPS64"

Could you do that before committing the patch, please? Thanks.

---
Vincent

#2 lore raw

PATCH v2 1/1 libtool: Apply upstream patch to set correct linkage on

In reply to Vicente Olivert Riera
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Vicente" == Vicente Olivert Riera <[email protected]> writes:

This libtool change ensures that ld uses the right machine emulation file, which will allow to fix several MIPS64 n64 link failures, such as the one currently visible on the libiscsi package. Packages affected by this problem will have to use <pkg>_AUTORECONF = YES to benefit from this libtool fix, until they are fixed upstream.

Committed with the subject fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard