| 1 |
commit: 00cd31a1d41d0580b2f9ac765badb234e0643ea2 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Jan 30 08:12:47 2022 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jan 30 08:12:47 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/autotools-wrappers.git/commit/?id=00cd31a1 |
| 7 |
|
| 8 |
autoconf-wrapper: simplify known version list |
| 9 |
|
| 10 |
Since the 2.1/2.5 version aliases are inlined in the WANT_AUTOCONF |
| 11 |
parse logic now, there's no need to keep annotating every specific |
| 12 |
version with it. Drop it to simplify the logic a bit. |
| 13 |
|
| 14 |
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org> |
| 15 |
|
| 16 |
ac-wrapper.sh | 21 +++++++++------------ |
| 17 |
1 file changed, 9 insertions(+), 12 deletions(-) |
| 18 |
|
| 19 |
diff --git a/ac-wrapper.sh b/ac-wrapper.sh |
| 20 |
index 57324bb..bd9a8d9 100755 |
| 21 |
--- a/ac-wrapper.sh |
| 22 |
+++ b/ac-wrapper.sh |
| 23 |
@@ -78,14 +78,13 @@ fi |
| 24 |
# Set up bindings between actual version and WANT_AUTOCONF; |
| 25 |
# Start at last known unstable/stable versions to speed up lookup process. |
| 26 |
# |
| 27 |
-KNOWN_AUTOCONF="2.71:2.5 2.70:2.5 2.69:2.5" |
| 28 |
-vers="${KNOWN_AUTOCONF} 9999:2.5 $(printf '2.%s:2.5 ' `seq 99 -1 59`) 2.13:2.1" |
| 29 |
+KNOWN_AUTOCONF="2.71 2.70 2.69" |
| 30 |
+vers="${KNOWN_AUTOCONF} 9999 $(printf '2.%s ' `seq 99 -1 59`) 2.13" |
| 31 |
|
| 32 |
binary="" |
| 33 |
for v in ${vers} ; do |
| 34 |
- auto_ver=${v%:*} |
| 35 |
- if [ -z "${binary}" ] && [ -x "${full_argv0}-${auto_ver}" ] ; then |
| 36 |
- binary="${full_argv0}-${auto_ver}" |
| 37 |
+ if [ -z "${binary}" ] && [ -x "${full_argv0}-${v}" ] ; then |
| 38 |
+ binary="${full_argv0}-${v}" |
| 39 |
break |
| 40 |
fi |
| 41 |
done |
| 42 |
@@ -107,7 +106,6 @@ if [ -n "${WANT_AUTOCONF}" ] ; then |
| 43 |
break |
| 44 |
fi |
| 45 |
|
| 46 |
- auto_ver=${v%:*} |
| 47 |
for wx in ${WANT_AUTOCONF} ; do |
| 48 |
if [ "${wx}" = "latest" ] ; then |
| 49 |
wx="2.5" |
| 50 |
@@ -119,12 +117,12 @@ if [ -n "${WANT_AUTOCONF}" ] ; then |
| 51 |
v="x" |
| 52 |
break |
| 53 |
elif [ "${wx}" = "2.5" ] ; then |
| 54 |
- if [ "${auto_ver}" = "2.13" ] ; then |
| 55 |
+ if [ "${v}" = "2.13" ] ; then |
| 56 |
# The "2.5" alias accepts every version except 2.13. |
| 57 |
continue |
| 58 |
fi |
| 59 |
- if [ -x "${full_argv0}-${auto_ver}" ] ; then |
| 60 |
- binary="${full_argv0}-${auto_ver}" |
| 61 |
+ if [ -x "${full_argv0}-${v}" ] ; then |
| 62 |
+ binary="${full_argv0}-${v}" |
| 63 |
v="x" |
| 64 |
break |
| 65 |
fi |
| 66 |
@@ -191,9 +189,8 @@ fi |
| 67 |
# |
| 68 |
if [ -z "${WANT_AUTOCONF}" ] ; then |
| 69 |
for v in ${vers} ; do |
| 70 |
- auto_ver=${v%:*} |
| 71 |
- if [ "${binary}" = "${full_argv0}-${auto_ver}" ] ; then |
| 72 |
- export WANT_AUTOCONF="${auto_ver}" |
| 73 |
+ if [ "${binary}" = "${full_argv0}-${v}" ] ; then |
| 74 |
+ export WANT_AUTOCONF="${v}" |
| 75 |
break |
| 76 |
fi |
| 77 |
done |
Archives