Rather than guess at variable name changes, perform version sanity checks to make sure that the libtool version being used by configure (via aclocal.m4/libtool.m4) matches that of the local ltmain.sh/libtool files.

3 files changed, 59 insertions, 35 deletions

diff --git a/sys-devel/libtool/files/1.5.10/libtool-1.5.10-version-checking.patch b/sys-devel/libtool/files/1.5.10/libtool-1.5.10-version-checking.patch
new file mode 100644
index 000000000000..392d81ceabec
--- /dev/null
+++ b/sys-devel/libtool/files/1.5.10/libtool-1.5.10-version-checking.patch
@@ -0,0 +1,59 @@
+--- libtool-1.5.10/libtool.m4.orig	2004-12-11 13:28:30.494718288 -0500
++++ libtool-1.5.10/libtool.m4	2004-12-11 13:31:51.452168112 -0500
+@@ -227,6 +227,14 @@
+     [pic_mode=default])
+ test -z "$pic_mode" && pic_mode=default
+ 
++# Check if we have a version mismatch between libtool.m4 and ltmain.sh.
++#
++# Note:  This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.
++#        We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
++#        calls AC_LIBTOOL_CONFIG and creates libtool.
++#
++_LT_VERSION_CHECK
++
+ # Use C for the default configuration in the libtool script
+ tagname=
+ AC_LIBTOOL_LANG_C_CONFIG
+@@ -234,6 +242,41 @@
+ ])# AC_LIBTOOL_SETUP
+ 
+ 
++# _LT_VERSION_CHECK
++# -----------------
++AC_DEFUN([_LT_VERSION_CHECK],
++[AC_MSG_CHECKING([for correct ltmain.sh version])
++if test -z "$ltmain"; then
++  AC_MSG_RESULT(no)
++  echo
++  echo "*** [Gentoo] sanity check failed! ***"
++  echo "*** \$ltmain is not defined, please check the patch for consistency! ***"
++  echo
++  exit 1
++fi
++gentoo_lt_version="@_LT_VERSION@"
++gentoo_ltmain_version=`grep '^[[:space:]]*VERSION=' $ltmain | sed -e 's|^[[:space:]]*VERSION=||'`
++if test "$gentoo_lt_version" != "$gentoo_ltmain_version"; then
++  AC_MSG_RESULT(no)
++  echo
++  echo "*** [Gentoo] sanity check failed! ***"
++  echo "*** libtool.m4 and ltmain.sh have a version mismatch! ***"
++  echo "*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***"
++  echo
++  echo "Please run:"
++  echo
++  echo "  libtoolize --copy --force"
++  echo
++  echo "if appropriate, please contact the maintainer of this"
++  echo "package (or your distribution) for help."
++  echo
++  exit 1
++else
++  AC_MSG_RESULT(yes)
++fi
++])# _LT_VERSION_CHECK
++
++
+ # _LT_AC_SYS_COMPILER
+ # -------------------
+ AC_DEFUN([_LT_AC_SYS_COMPILER],
diff --git a/sys-devel/libtool/files/1.5.6/libtool-1.5.6-libtool_m4-shared_ext.patch b/sys-devel/libtool/files/1.5.6/libtool-1.5.6-libtool_m4-shared_ext.patch
deleted file mode 100644
index ba46f009af18..000000000000
--- a/sys-devel/libtool/files/1.5.6/libtool-1.5.6-libtool_m4-shared_ext.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- libtool-1.5.2/libtool.m4	2004-02-10 00:23:58.000000000 +0200
-+++ libtool-1.5.2.shared_ext/libtool.m4	2004-02-10 23:32:08.364266152 +0200
-@@ -229,6 +229,7 @@
- tagname=
- AC_LIBTOOL_LANG_C_CONFIG
- _LT_AC_TAGCONFIG
-+_LT_AC_SHARED_EXT
- ])# AC_LIBTOOL_SETUP
- 
- 
-@@ -1788,6 +1789,24 @@
- fi
- ])# _LT_AC_TAGCONFIG
- 
-+# _LT_AC_SHARED_EXT
-+# ----------------
-+AC_DEFUN([_LT_AC_SHARED_EXT],[
-+  if test ! -f "${ofile}"; then
-+    AC_MSG_WARN([output file `$ofile' does not exist])
-+  fi
-+  if test -z "`grep -e 'shared_ext.*shrext_cmds' $ofile`"; then
-+    # Make sure $shared_ext gets set to $shrext_cmds
-+    if sed -e 's/shared_ext/shrext_cmds/g' "$ofile" > "${ofile}T"; then
-+      mv "${ofile}T" "$ofile"
-+      chmod +x "$ofile"
-+    else
-+      rm -f "${ofile}T"
-+      AC_MSG_ERROR([unable to update shared_ext.])
-+    fi
-+  fi
-+])# _LT_AC_SHARED_EXT
-+
- 
- # AC_LIBTOOL_DLOPEN
- # -----------------
diff --git a/sys-devel/libtool/files/digest-libtool-1.5.10 b/sys-devel/libtool/files/digest-libtool-1.5.10-r1
index cab20e0c9462..cab20e0c9462 100644
--- a/sys-devel/libtool/files/digest-libtool-1.5.10
+++ b/sys-devel/libtool/files/digest-libtool-1.5.10-r1