summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-11-05 10:22:00 +0000
committerMike Frysinger <vapier@gentoo.org>2006-11-05 10:22:00 +0000
commit497907eccad871caf658761805666b9c8564f3df (patch)
tree15e2999d236bf0b86b06cad6efde986923fc3c1d /sys-devel/automake-wrapper/files
parentversion bump to 1.12.6; 1.11.15 is broken; cleanup (diff)
downloadgentoo-2-497907eccad871caf658761805666b9c8564f3df.tar.gz
gentoo-2-497907eccad871caf658761805666b9c8564f3df.tar.bz2
gentoo-2-497907eccad871caf658761805666b9c8564f3df.zip
Make sure we break out of new loop as reported by Alexis Ballier.
(Portage version: 2.1.2_rc1-r2)
Diffstat (limited to 'sys-devel/automake-wrapper/files')
-rwxr-xr-xsys-devel/automake-wrapper/files/am-wrapper-3.sh8
-rw-r--r--sys-devel/automake-wrapper/files/digest-automake-wrapper-3-r10
2 files changed, 6 insertions, 2 deletions
diff --git a/sys-devel/automake-wrapper/files/am-wrapper-3.sh b/sys-devel/automake-wrapper/files/am-wrapper-3.sh
index ff8cde7b22c5..5596468e64ea 100755
--- a/sys-devel/automake-wrapper/files/am-wrapper-3.sh
+++ b/sys-devel/automake-wrapper/files/am-wrapper-3.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 1999-2006 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-3.sh,v 1.2 2006/11/05 08:22:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/automake-wrapper/files/am-wrapper-3.sh,v 1.3 2006/11/05 10:22:00 vapier Exp $
# Based on the am-wrapper.pl script provided by MandrakeSoft
# Rewritten in bash by Gregorio Guidi
@@ -88,12 +88,16 @@ if [ -n "${WANT_AUTOMAKE}" ] ; then
if [ "${wx}" = "${v}" ] ; then
binary="binary_${v/./_}"
binary="${!binary}"
- break
+ v="x"
fi
done
+ [ "${v}" = "x" ] && break
done
fi
+#
+# autodetect helpers
+#
do_awk() {
local file=$1 ; shift
local arg=$1 ; shift
diff --git a/sys-devel/automake-wrapper/files/digest-automake-wrapper-3-r1 b/sys-devel/automake-wrapper/files/digest-automake-wrapper-3-r1
new file mode 100644
index 000000000000..e69de29bb2d1
--- /dev/null
+++ b/sys-devel/automake-wrapper/files/digest-automake-wrapper-3-r1