summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-11-05 08:22:46 +0000
committerMike Frysinger <vapier@gentoo.org>2006-11-05 08:22:46 +0000
commitb6ae70f81a7085ab0fcc3dd7dfb339eb8df2c467 (patch)
tree8bd9325dfd7a6615a464aa2ecc87ad6d210d59ec /sys-devel
parentMake default automake selection more flexible and allow WANT_AUTOMAKE to cont... (diff)
downloadhistorical-b6ae70f81a7085ab0fcc3dd7dfb339eb8df2c467.tar.gz
historical-b6ae70f81a7085ab0fcc3dd7dfb339eb8df2c467.tar.bz2
historical-b6ae70f81a7085ab0fcc3dd7dfb339eb8df2c467.zip
make sure we warn when someone uses an invalid WANT_AUTOMAKE value
Package-Manager: portage-2.1.2_rc1-r2
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/automake-wrapper/Manifest14
-rwxr-xr-xsys-devel/automake-wrapper/files/am-wrapper-3.sh3
2 files changed, 9 insertions, 8 deletions
diff --git a/sys-devel/automake-wrapper/Manifest b/sys-devel/automake-wrapper/Manifest
index 00fa16edf3cc..06e45d5a4820 100644
--- a/sys-devel/automake-wrapper/Manifest
+++ b/sys-devel/automake-wrapper/Manifest
@@ -9,10 +9,10 @@ AUX am-wrapper-2.sh 3619 RMD160 3061b207b1295e29272ccd5408692bb009c135d8 SHA1 e9
MD5 421009f3057f211f8d6f817b4544bebc files/am-wrapper-2.sh 3619
RMD160 3061b207b1295e29272ccd5408692bb009c135d8 files/am-wrapper-2.sh 3619
SHA256 78775190704bee7b67c2b4f28cb84ed999e3f43f23c5054e8a48a90e7d80d8b8 files/am-wrapper-2.sh 3619
-AUX am-wrapper-3.sh 4202 RMD160 935fa9a80ef5a9b85655e60834358ead7cd2f0cd SHA1 36360445000887f7db62f9c44a99f148c1b7dffd SHA256 282698f71d74b61a532e7f90dff3f421b5fc8c1985086941fd84a5b3fdb72596
-MD5 b728019e36000ba4956b3f972340d362 files/am-wrapper-3.sh 4202
-RMD160 935fa9a80ef5a9b85655e60834358ead7cd2f0cd files/am-wrapper-3.sh 4202
-SHA256 282698f71d74b61a532e7f90dff3f421b5fc8c1985086941fd84a5b3fdb72596 files/am-wrapper-3.sh 4202
+AUX am-wrapper-3.sh 4289 RMD160 f027a0450fe8d62849f85be8897a9250c5ae139c SHA1 27d087d16093dfbf6a3b95f59f0f50ded15eb6e0 SHA256 b536820c2722d2d6fb302ec2181777b7d5a4aff61e9bf20ea7ce1df4ae872e0b
+MD5 0e65d7f2d1370bb34678603ca36a867a files/am-wrapper-3.sh 4289
+RMD160 f027a0450fe8d62849f85be8897a9250c5ae139c files/am-wrapper-3.sh 4289
+SHA256 b536820c2722d2d6fb302ec2181777b7d5a4aff61e9bf20ea7ce1df4ae872e0b files/am-wrapper-3.sh 4289
EBUILD automake-wrapper-1-r1.ebuild 774 RMD160 e87bc49669ff7f3d5a3554f45e3ad1921a8778e2 SHA1 087d0d44cc2fbf0522112737a8a881eb87402aa4 SHA256 5ce6aff80a660d47752de9e74e43ba40853a94b21f19ac57769a8e14ad546242
MD5 b31042b0af883c9bf0a9ba4f100b6a23 automake-wrapper-1-r1.ebuild 774
RMD160 e87bc49669ff7f3d5a3554f45e3ad1921a8778e2 automake-wrapper-1-r1.ebuild 774
@@ -45,7 +45,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
-iD8DBQFFTZzFamhnQswr0vIRAu+LAKCpwhZnbzQ/c3W6avAVe/d07jzFSACfYrMG
-AS28lPFAlP7no7Uarvnq36A=
-=bzA5
+iD8DBQFFTZ90amhnQswr0vIRAsbbAJoDWyHtwY65XKitOrkufUW9Sm+CTQCdEjOj
+jhcrYQ+awY4ISXSxLUn0eas=
+=qWBn
-----END PGP SIGNATURE-----
diff --git a/sys-devel/automake-wrapper/files/am-wrapper-3.sh b/sys-devel/automake-wrapper/files/am-wrapper-3.sh
index 0bbb69a927cd..ff8cde7b22c5 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.1 2006/11/05 08:11:18 vapier Exp $
+# $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 $
# Based on the am-wrapper.pl script provided by MandrakeSoft
# Rewritten in bash by Gregorio Guidi
@@ -79,6 +79,7 @@ fi
if [ -n "${WANT_AUTOMAKE}" ] ; then
for v in ${vers} x ; do
if [ "${v}" = "x" ] ; then
+ echo "am-wrapper: warning: invalid WANT_AUTOMAKE '${WANT_AUTOMAKE}'; ignoring." >&2
unset WANT_AUTOMAKE
break
fi