Work around a gentoo-specific version checking construct that appears to

be entirely bogus.
This commit is contained in:
Ade Lovett 2008-01-29 20:58:24 +00:00
parent cf4aafd3c7
commit b05e90bcbd
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=206401
2 changed files with 69 additions and 3 deletions

View File

@ -23,10 +23,10 @@ USE_OPENSSL= YES
USE_AUTOTOOLS= libtool:15
post-patch:
.for file in config.guess config.sub ltmain.sh
@${RM} -v ${WRKSRC}/config/${file}
@${LN} -fs ${LIBTOOL_SHAREDIR}/${file} ${WRKSRC}/config/${file}
.for file in config.guess config.sub ltmain.sh
@${LN} -fs ${LIBTOOL_SHAREDIR}/${file} ${WRKSRC}/config/${file}
.endfor
@${LN} -fs ${LIBTOOL} ${WRKSRC}/libtool
@${REINPLACE_CMD} 's,#define\ *DEFAULT_CONF_FILE .*,#define DEFAULT_CONF_FILE "${PREFIX}/etc/spine.conf",' ${WRKSRC}/spine.h
do-install:

View File

@ -0,0 +1,66 @@
--- configure.orig 2007-11-25 19:40:21.000000000 -0800
+++ configure 2008-01-29 12:55:30.000000000 -0800
@@ -7141,63 +7141,2 @@
-# 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.
-#
-{ echo "$as_me:$LINENO: checking for correct ltmain.sh version" >&5
-echo $ECHO_N "checking for correct ltmain.sh version... $ECHO_C" >&6; }
-if test "x$ltmain" = "x" ; then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: error:
-
-*** [Gentoo] sanity check failed! ***
-*** \$ltmain is not defined, please check the patch for consistency! ***
-" >&5
-echo "$as_me: error:
-
-*** [Gentoo] sanity check failed! ***
-*** \$ltmain is not defined, please check the patch for consistency! ***
-" >&2;}
- { (exit 1); exit 1; }; }
-fi
-gentoo_lt_version="1.5.22"
-gentoo_ltmain_version=`sed -n '/^[ ]*VERSION=/{s/^[ ]*VERSION=//;p;q;}' "$ltmain"`
-if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
- { { echo "$as_me:$LINENO: 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.
-" >&5
-echo "$as_me: 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.
-" >&2;}
- { (exit 1); exit 1; }; }
-else
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-fi
-
-
# Use C for the default configuration in the libtool script