diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-11-04 02:33:25 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-11-04 02:33:25 +0000 |
commit | 3679eaa75f1082a600ccacc2f85799b9fe771b73 (patch) | |
tree | c613e4783c0173e7c7642a0aa651239a169837b8 /sys-devel/libtool/files | |
parent | change default abi for mips64 toolchains to n32 and add a warning if we skip ... (diff) | |
download | historical-3679eaa75f1082a600ccacc2f85799b9fe771b73.tar.gz historical-3679eaa75f1082a600ccacc2f85799b9fe771b73.tar.bz2 historical-3679eaa75f1082a600ccacc2f85799b9fe771b73.zip |
Dont use non-portable character classes in Gentoo sanity check #111353 by Erik Månsson.
Package-Manager: portage-2.0.53_rc7
Diffstat (limited to 'sys-devel/libtool/files')
-rw-r--r-- | sys-devel/libtool/files/1.5.20/libtool-1.5.20-version-checking.patch | 65 | ||||
-rw-r--r-- | sys-devel/libtool/files/digest-libtool-1.5.20-r1 | 1 |
2 files changed, 66 insertions, 0 deletions
diff --git a/sys-devel/libtool/files/1.5.20/libtool-1.5.20-version-checking.patch b/sys-devel/libtool/files/1.5.20/libtool-1.5.20-version-checking.patch new file mode 100644 index 000000000000..63b8ef5be631 --- /dev/null +++ b/sys-devel/libtool/files/1.5.20/libtool-1.5.20-version-checking.patch @@ -0,0 +1,65 @@ +Add a sanity check to make sure the libtool code in the 'configure' script is +in sync with the local 'ltmain.sh'. If they are out of sync, libtool may +generate the libraries incorrectly. + +http://bugs.gentoo.org/73140 + +--- libtool-1.5.20/libtool.m4 ++++ libtool-1.5.20/libtool.m4 +@@ -212,6 +212,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 +@@ -219,6 +227,41 @@ + ])# AC_LIBTOOL_SETUP + + ++# _LT_VERSION_CHECK ++# ----------------- ++AC_DEFUN([_LT_VERSION_CHECK], ++[AC_MSG_CHECKING([for correct ltmain.sh version]) ++if test "x$ltmain" = "x" ; then ++ AC_MSG_RESULT(no) ++ AC_MSG_ERROR([ ++ ++*** @<:@Gentoo@:>@ sanity check failed! *** ++*** \$ltmain is not defined, please check the patch for consistency! *** ++]) ++fi ++gentoo_lt_version="@_LT_VERSION@" ++gentoo_ltmain_version=`grep '^@<:@ @:>@*VERSION=' $ltmain | sed -e 's|^@<:@ @:>@*VERSION=||'` ++if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then ++ AC_MSG_RESULT(no) ++ AC_MSG_ERROR([ ++ ++*** @<:@Gentoo@:>@ sanity check failed! *** ++*** libtool.m4 and ltmain.sh have a version mismatch! *** ++*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) *** ++ ++Please run: ++ ++ libtoolize --copy --force ++ ++if appropriate, please contact the maintainer of this ++package (or your distribution) for help. ++]) ++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/digest-libtool-1.5.20-r1 b/sys-devel/libtool/files/digest-libtool-1.5.20-r1 new file mode 100644 index 000000000000..4fab72c472e9 --- /dev/null +++ b/sys-devel/libtool/files/digest-libtool-1.5.20-r1 @@ -0,0 +1 @@ +MD5 fc3b564700aebcb19de841c1c2d66e99 libtool-1.5.20.tar.gz 2789331 |