diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2013-02-04 14:00:23 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2013-02-04 14:00:23 +0000 |
| commit | 16cdac618f51840dc57097ba3fbe1931646dcf96 (patch) | |
| tree | 0bb534c7b300846d96033fb75507f160244d9356 /sys-devel/automake-wrapper | |
| parent | Migrate to python-r1 (requested in bug #455376). (diff) | |
| download | gentoo-2-16cdac618f51840dc57097ba3fbe1931646dcf96.tar.gz gentoo-2-16cdac618f51840dc57097ba3fbe1931646dcf96.tar.bz2 gentoo-2-16cdac618f51840dc57097ba3fbe1931646dcf96.zip | |
Call gawk as before since GNU awk is required and breaks with e.g. BSD awk. Bug #455436
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'sys-devel/automake-wrapper')
| -rw-r--r-- | sys-devel/automake-wrapper/ChangeLog | 6 | ||||
| -rwxr-xr-x | sys-devel/automake-wrapper/files/am-wrapper-8.sh | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sys-devel/automake-wrapper/ChangeLog b/sys-devel/automake-wrapper/ChangeLog index 92596621b7cb..3e2b0ab9c8f8 100644 --- a/sys-devel/automake-wrapper/ChangeLog +++ b/sys-devel/automake-wrapper/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/automake-wrapper # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.66 2013/01/02 07:40:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/ChangeLog,v 1.67 2013/02/04 14:00:23 aballier Exp $ + + 04 Feb 2013; Alexis Ballier <aballier@gentoo.org> files/am-wrapper-8.sh: + Call gawk as before since GNU awk is required and breaks with e.g. BSD awk. + Bug #455436 *automake-wrapper-8 (02 Jan 2013) diff --git a/sys-devel/automake-wrapper/files/am-wrapper-8.sh b/sys-devel/automake-wrapper/files/am-wrapper-8.sh index 0e2311a06061..1602316cd28f 100755 --- a/sys-devel/automake-wrapper/files/am-wrapper-8.sh +++ b/sys-devel/automake-wrapper/files/am-wrapper-8.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-8.sh,v 1.1 2013/01/02 07:40:04 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-8.sh,v 1.2 2013/02/04 14:00:23 aballier Exp $ # Executes the correct automake version. # @@ -128,7 +128,7 @@ fi do_awk() { local file=$1 ; shift local arg=$1 ; shift - local v=$(awk "{ if (match(\$0, \"$*\", res)) { print res[${arg}]; exit } }" "${file}") + local v=$(gawk "{ if (match(\$0, \"$*\", res)) { print res[${arg}]; exit } }" "${file}") case " ${auto_vers} " in *" ${v} "*) ;; *) auto_vers="${auto_vers:+${auto_vers} }${v}" ;; |