rhill 14/05/20 08:00:40 Modified: fix_libtool_files.sh Log: Stop using einfo/eerror in fix_libtool_files.sh to avoid a dependency on sys-apps/gentoo-functions (bug #504434). Signed-off-by: Ryan Hill <rh...@gentoo.org> (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 957A8463)
Revision Changes Path 1.17 sys-devel/gcc/files/fix_libtool_files.sh file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gcc/files/fix_libtool_files.sh?rev=1.17&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gcc/files/fix_libtool_files.sh?rev=1.17&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-devel/gcc/files/fix_libtool_files.sh?r1=1.16&r2=1.17 Index: fix_libtool_files.sh =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/fix_libtool_files.sh,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fix_libtool_files.sh 18 May 2012 21:28:56 -0000 1.16 +++ fix_libtool_files.sh 20 May 2014 08:00:40 -0000 1.17 @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/fix_libtool_files.sh,v 1.16 2012/05/18 21:28:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/files/fix_libtool_files.sh,v 1.17 2014/05/20 08:00:40 rhill Exp $ usage() { cat << "USAGE_END" @@ -38,10 +38,9 @@ ARGV3=$3 . /etc/profile || exit 1 -. /etc/init.d/functions.sh || exit 1 if [ ${EUID:-0} -ne 0 ] ; then - eerror "${0##*/}: Must be root." + echo "${0##*/}: Must be root." exit 1 fi @@ -54,7 +53,7 @@ AWKDIR="/usr/share/gcc-data" if [ ! -r "${AWKDIR}/fixlafiles.awk" ] ; then - eerror "${0##*/}: ${AWKDIR}/fixlafiles.awk does not exist!" + echo "${0##*/}: ${AWKDIR}/fixlafiles.awk does not exist!" exit 1 fi @@ -62,7 +61,7 @@ export OLDVER OLDCHOST -einfo "Scanning libtool files for hardcoded gcc library paths..." +echo "Scanning libtool files for hardcoded gcc library paths..." exec gawk -f "${AWKDIR}/fixlafiles.awk" # vim:ts=4