| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Crank LAST_KNOWN_AUTOMAKE_VER.
Signed-off-by: Sam James <sam@gentoo.org>
|
|
|
|
| |
Signed-off-by: Sam James <sam@gentoo.org>
|
|
|
|
|
|
|
|
|
| |
We need to optionally match the ., not require digits following period in version group.
Bug: https://bugs.gentoo.org/870169
Fixes: 6f9e65b68174b938714100f34f399844f8d2cb93
Signed-off-by: Arsen Arsenović <arsen@aarsen.me>
Signed-off-by: Sam James <sam@gentoo.org>
|
|
|
|
| |
Signed-off-by: Sam James <sam@gentoo.org>
|
|
|
|
| |
Signed-off-by: Sam James <sam@gentoo.org>
|
|
|
|
|
|
|
|
| |
Make sure we chop the trailing period from the version string to fix
comparing to installed versions. Otherwise, "2.69." will never match
"2.69".
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
|
|
|
|
|
|
| |
Try to use variables to hold the tool name to reduce the differences
between the scripts. Hopefully this will make it a little easier to
keep the two in sync.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
|
|
|
|
|
| |
Sync the automake behavior to autoconf where we expand all possible
versions only if the current ones not found.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
|
|
|
|
|
|
|
| |
This doesn't add much value, and would never fire in an installed
setup. It was meant to catch `./ac-wrapper.sh` usage in the source
tree, but the code largely executes fine otherwise, so might as well
punt it.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
|
|
|
|
| |
Copy the style used in the automake wrapper over.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
|
|
|
|
| |
This sync the logic that's been in the automake wrapper for a long time.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
|
|
|
|
| |
We don't use braces on single-character shell builtins.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
|
|
|
|
|
|
| |
Generalize the "install autoconf" message to not refer to emerge
specifically since this script isn't specific to emerge, or even
Gentoo for that matter.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
|
|
|
|
|
|
|
| |
If WANT_AUTOCONF isn't set, don't just default to the latest version.
If the current directory has configure or aclocal.m4 files previously
generated with a specific autoconf version, then use that if available.
This matches how the automake wrapper behaves.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
|
|
|
|
|
|
| |
Take the WANT_AUTOMAKE approach to parsing to find a matching version.
This simplifies the code a bit, and will allow us to do better dynamic
detection in a follow up.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
|
|
|
|
|
|
| |
Since the 2.1/2.5 version aliases are inlined in the WANT_AUTOCONF
parse logic now, there's no need to keep annotating every specific
version with it. Drop it to simplify the logic a bit.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
|
|
|
|
|
|
|
| |
The intention was that we break on the first match in WANT_AUTOCONF,
so add that missing break statement. In practice, people only ever
set one value in WANT_AUTOCONF, so that's probably why no one has
ever noticed this bug before.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
|
|
|
|
|
|
|
|
|
| |
The 2.1 alias only ever expanded into the 2.13 version. Every other
version uses the 2.5 alias, and at this point, seems extremely unlikely
that this will ever change (or that we'd add a new alias set). Rework
the WANT_AUTOCONF checking logic to rewrite 2.1 to 2.13, and then accept
any non-2.13 version when 2.5 is used. This will allow us to burn down
the alias logic entirely which will simplify the code nicely.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
|
|
|
|
|
|
|
|
| |
When exporting the WANT_AUTOCONF version based on what we picked, use
the full version instead of the short 2.1 or 2.5 values since they may
expand into an unrelated version (since we accept many versions as an
alias to 2.5). Practically speaking, there shouldn't be a difference,
but this will make things a bit more clear.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
|
|
|
|
|
| |
Unwrap it a bit to take up fewer lines while still fitting within a
reasonable line length, and fix the grammar in a number of places.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
|
|
|
|
|
|
| |
It's not clear why this was made into an env var as nothing ever
sets it in ebuilds/eclasses, and we don't have a desire to allow
them to either. It's also not how the automake-wrapper works.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
|
|
|
|
| |
The -E option to enable POSIX ERE is more portable.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
|
|
|
|
| |
Match existing automake-wrapper behavior.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|\
| |
| |
| |
| |
| |
| | |
This is reconstructed from the CVS & git history from the automake &
automake-wrapper packages.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
| |
| |
| |
| |
| |
| | |
Add sys-devel/automake-1.16 support.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
|
| |
| |
| |
| | |
Bug: 611234
|
| |
| |
| |
| |
| | |
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC
|
| |
| |
| |
| |
| | |
Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156
|
| |
| |
| |
| |
| |
| |
| | |
Bug #455436
Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A
|
| |
| |
| |
| |
| |
| |
| | |
Förster.
Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156
|
| |
| |
| |
| | |
Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64
|
| |
| |
| |
| |
| |
| | |
path #385201 by Florian Philipp.
Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64
|
| |
| |
| |
| | |
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64
|
| |
| |
| |
| |
| |
| | |
not be installed in the host system.
Package-Manager: portage-2.1.7.16/cvs/Linux i686
|
| |
| |
| |
| | |
Package-Manager: portage-2.2_rc33/cvs/Linux x86_64
|
| |
| |
| |
| | |
Package-Manager: portage-2.1.2_rc1-r2
|
| |
| |
| |
| | |
Package-Manager: portage-2.1.2_rc1-r2
|
| |
| |
| |
| |
| |
| | |
contain a list of versions.
Package-Manager: portage-2.1.2_rc1-r2
|
| |
| |
| |
| | |
Package-Manager: portage-2.1.2_pre2-r9
|
| |
| |
| |
| | |
Package-Manager: portage-2.0.51.21-r1
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
Break the automake wrapper (am-wrapper.pl) off into its own package.
|
| |
| |
| |
| |
| | |
check AC_PREREQ and AM_AUTOMAKE_VERSION (allows us to check strings beyond the
first match).
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
Update version. Change WANT_AUTOMAKE_1_?=1 selection scheme to
WANT_AUTOMAKE=<version>.
|
| |
| |
| |
| |
| |
| | |
Firstly, 'am-wrapper.pl' is based on 'ac-wrapper.pl'. This is a nifty
script by Guillaume Cottenceau (gc@mandrakesoft.com). This release
adds updates for automake-1.6 detection.
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
New version. Thanks to Alexander Kelett for the initial version that
contains all three major releases, and also am-wrapper.pl-1.6.
Changes from his version: 1.5d has to have "-1.5d" as suffix, and
not "-1.5", as this causes calls by aclocal to automake to fail,
as they have multiversion support. Also fixed some other problems
that was part of my first dual version. Added the sed to change
the "-1.5x" in am-wrapper.pl-1.6 to "-1.5d".
Anyway, should resolve bug 2803.
|