Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/autotools-wrappers:main commit in: /
Date: Tue, 08 Feb 2022 02:58:43
Message-Id: 1644289041.6f9e65b68174b938714100f34f399844f8d2cb93.vapier@gentoo
1 commit: 6f9e65b68174b938714100f34f399844f8d2cb93
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 8 02:57:21 2022 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 8 02:57:21 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/autotools-wrappers.git/commit/?id=6f9e65b6
7
8 autoconf-wrapper: fix version detection
9
10 Make sure we chop the trailing period from the version string to fix
11 comparing to installed versions. Otherwise, "2.69." will never match
12 "2.69".
13
14 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
15
16 ac-wrapper.sh | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-)
18
19 diff --git a/ac-wrapper.sh b/ac-wrapper.sh
20 index ce576c6..5a489a2 100755
21 --- a/ac-wrapper.sh
22 +++ b/ac-wrapper.sh
23 @@ -146,7 +146,7 @@ acprereq_version() {
24 }
25
26 generated_version() {
27 - local re='^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9.]+).*'
28 + local re='^# Generated (by (GNU )?Autoconf|automatically using autoconf version) ([0-9.]+)\..*'
29 sed -n -E "/${re}/{s:${re}:\3:;p;q}" "$@"
30 }