Gentoo Archives: gentoo-dev

From: haubi@g.o
To: gentoo-dev@l.g.o
Cc: haubi@g.o
Subject: [gentoo-dev] [PATCH 4/4] winnt: die if libtool version is not 2.4.6+
Date: Thu, 12 Mar 2020 08:08:25
Message-Id: 20200312080626.5163-5-haubi@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/4] elt-patches: support wrapped Win32 MSVC toolchain by haubi@gentoo.org
1 From: Michael Haubenwallner <haubi@g.o>
2
3 Signed-off-by: Michael Haubenwallner <haubi@g.o>
4 ---
5 eltpatch.in | 14 +++++++++++++-
6 1 file changed, 13 insertions(+), 1 deletion(-)
7
8 diff --git a/eltpatch.in b/eltpatch.in
9 index 6b69216..e12f754 100644
10 --- a/eltpatch.in
11 +++ b/eltpatch.in
12 @@ -179,7 +179,7 @@ elibtoolize() {
13 *-hpux*) elt_patches+=" hpux-conf deplibs hc-flag-ld hardcode hardcode-relink relink-prog no-lc" ;;
14 *-irix*) elt_patches+=" irix-ltmain" ;;
15 *-mint*) elt_patches+=" mint-conf" ;;
16 - *-winnt*) elt_patches+=" winnt-conf winnt-ltmain" ;;
17 + *-winnt*) elt_patches+=" winnt-ltmain winnt-conf" ;;
18 esac
19
20 if ${LD} --version 2>&1 | grep -qs 'GNU gold'; then
21 @@ -286,6 +286,18 @@ elibtoolize() {
22 ret=$?
23 fi
24 ;;
25 + winnt-ltmain)
26 + local version=$(ELT_libtool_version "${d}/ltmain.sh")
27 + case ${version} in
28 + 2.4.6 | 2.4.6[' .']* )
29 + ELT_walk_patches "${d}/ltmain.sh" "${p}"
30 + ret=$?
31 + ;;
32 + *)
33 + die "${p}: need libtool 2.4.6+ (not ${version}) in ${d}"
34 + ;;
35 + esac
36 + ;;
37 *)
38 ELT_walk_patches "${d}/ltmain.sh" "${p}"
39 ret=$?
40 --
41 2.22.0

Replies