From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9900E138350 for ; Fri, 13 Mar 2020 14:37:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE888E0B60; Fri, 13 Mar 2020 14:37:52 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B6963E0B60 for ; Fri, 13 Mar 2020 14:37:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E6BFA34EF8F for ; Fri, 13 Mar 2020 14:37:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8D77B178 for ; Fri, 13 Mar 2020 14:37:50 +0000 (UTC) From: "Michael Haubenwallner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Haubenwallner" Message-ID: <1584107784.a13029e428c2bc84343bb0a3d629ab7c7f33590c.haubi@gentoo> Subject: [gentoo-commits] proj/elt-patches:master commit in: / X-VCS-Repository: proj/elt-patches X-VCS-Files: eltpatch.in X-VCS-Directories: / X-VCS-Committer: haubi X-VCS-Committer-Name: Michael Haubenwallner X-VCS-Revision: a13029e428c2bc84343bb0a3d629ab7c7f33590c X-VCS-Branch: master Date: Fri, 13 Mar 2020 14:37:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 425a059c-99ee-4ae1-9ea3-f3a60097f620 X-Archives-Hash: f6a5e1830d190b329288ddd78c83008f commit: a13029e428c2bc84343bb0a3d629ab7c7f33590c Author: Michael Haubenwallner gentoo org> AuthorDate: Mon Oct 28 14:11:53 2019 +0000 Commit: Michael Haubenwallner gentoo 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 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=$?