commit: a13029e428c2bc84343bb0a3d629ab7c7f33590c
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 28 14:11:53 2019 +0000
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 13 13:56:24 2020 +0000
URL: https://gitweb.gentoo.org/proj/elt-patches.git/commit/?id=a13029e4
winnt: die if libtool version is not 2.4.6+
Reorder in elt_patches to perform the check early.
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org>
eltpatch.in | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/eltpatch.in b/eltpatch.in
index 6b69216..e12f754 100644
--- a/eltpatch.in
+++ b/eltpatch.in
@@ -179,7 +179,7 @@ elibtoolize() {
*-hpux*) elt_patches+=" hpux-conf deplibs hc-flag-ld
hardcode hardcode-relink relink-prog no-lc" ;;
*-irix*) elt_patches+=" irix-ltmain" ;;
*-mint*) elt_patches+=" mint-conf" ;;
- *-winnt*) elt_patches+=" winnt-conf winnt-ltmain" ;;
+ *-winnt*) elt_patches+=" winnt-ltmain winnt-conf" ;;
esac
if ${LD} --version 2>&1 | grep -qs 'GNU gold'; then
@@ -286,6 +286,18 @@ elibtoolize() {
ret=$?
fi
;;
+ winnt-ltmain)
+ local version=$(ELT_libtool_version
"${d}/ltmain.sh")
+ case ${version} in
+ 2.4.6 | 2.4.6[' .']* )
+ ELT_walk_patches
"${d}/ltmain.sh" "${p}"
+ ret=$?
+ ;;
+ *)
+ die "${p}: need libtool 2.4.6+
(not ${version}) in ${d}"
+ ;;
+ esac
+ ;;
*)
ELT_walk_patches "${d}/ltmain.sh" "${p}"
ret=$?
