diff options
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/gcc/files/fix_libtool_files.sh | 11 |
2 files changed, 10 insertions, 7 deletions
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog index 150b9813f6e5..4f8c36349455 100644 --- a/sys-devel/gcc/ChangeLog +++ b/sys-devel/gcc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/gcc # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.1001 2014/05/18 08:33:52 rhill Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.1002 2014/05/20 08:00:39 rhill Exp $ + + 20 May 2014; Ryan Hill <rhill@gentoo.org> files/fix_libtool_files.sh: + Stop using einfo/eerror in fix_libtool_files.sh to avoid a dependency on + sys-apps/gentoo-functions (bug #504434). *gcc-4.9.0 (18 May 2014) diff --git a/sys-devel/gcc/files/fix_libtool_files.sh b/sys-devel/gcc/files/fix_libtool_files.sh index c55250b6bacc..0c8a42bdc67d 100644 --- a/sys-devel/gcc/files/fix_libtool_files.sh +++ b/sys-devel/gcc/files/fix_libtool_files.sh @@ -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 @@ ARGV2=$2 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 @@ OLDCHOST= 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 @@ OLDVER=${ARGV1} 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 |