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: Sun, 30 Jan 2022 09:24:26
Message-Id: 1643530065.96ba24a7da70f7149a071c98be37461df50b83e7.vapier@gentoo
1 commit: 96ba24a7da70f7149a071c98be37461df50b83e7
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jan 30 08:07:45 2022 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 30 08:07:45 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/autotools-wrappers.git/commit/?id=96ba24a7
7
8 autoconf-wrapper: make sure we break on first match, not last
9
10 The intention was that we break on the first match in WANT_AUTOCONF,
11 so add that missing break statement. In practice, people only ever
12 set one value in WANT_AUTOCONF, so that's probably why no one has
13 ever noticed this bug before.
14
15 Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
16
17 ac-wrapper.sh | 2 ++
18 1 file changed, 2 insertions(+)
19
20 diff --git a/ac-wrapper.sh b/ac-wrapper.sh
21 index 4682082..57324bb 100755
22 --- a/ac-wrapper.sh
23 +++ b/ac-wrapper.sh
24 @@ -117,6 +117,7 @@ if [ -n "${WANT_AUTOCONF}" ] ; then
25 if [ -x "${full_argv0}-${wx}" ] ; then
26 binary="${full_argv0}-${wx}"
27 v="x"
28 + break
29 elif [ "${wx}" = "2.5" ] ; then
30 if [ "${auto_ver}" = "2.13" ] ; then
31 # The "2.5" alias accepts every version except 2.13.
32 @@ -125,6 +126,7 @@ if [ -n "${WANT_AUTOCONF}" ] ; then
33 if [ -x "${full_argv0}-${auto_ver}" ] ; then
34 binary="${full_argv0}-${auto_ver}"
35 v="x"
36 + break
37 fi
38 fi
39 done