From 11e133542754c8ac64e1f7d5599a64d0bffae7ee Mon Sep 17 00:00:00 2001 From: Travis Tilley Date: Wed, 6 Oct 2004 22:23:29 +0000 Subject: [PATCH] fix those annoying QA messages about awk, part 2 --- sys-devel/gcc/Manifest | 4 ++-- sys-devel/gcc/gcc-3.3.3.ebuild | 10 ++++++---- sys-devel/gcc/gcc-3.4.1.ebuild | 10 ++++++---- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest index 0016c165f6d7..2d6d2bfbe719 100644 --- a/sys-devel/gcc/Manifest +++ b/sys-devel/gcc/Manifest @@ -3,7 +3,8 @@ MD5 2f2650284e244eafc0795b02a1bdadd2 gcc-2.95.3-r8.ebuild 8306 MD5 88b21c03e4ebacabcd50654779d5d80f gcc-3.3.2-r5.ebuild 21362 MD5 ccc8851dd7b9f96078c1aff96b79c1d7 gcc-3.3.2-r2.ebuild 18038 MD5 b0f6eef081a1732ab7dfa425897d66e3 gcc-3.3.3_pre20040426.ebuild 22555 -MD5 e586ae3d1dfd608365379f735502944b gcc-3.3.3.ebuild 22203 +MD5 66089d59b528c2f119a3b525b68ecbc7 gcc-3.3.3.ebuild 22304 +MD5 08f2d93b55c2fc285c0e572c68ea3a9f gcc-3.4.1.ebuild 30311 MD5 45265b9a9c6aafef74bfc8e2cb311175 gcc-3.3.3-r3.ebuild 23571 MD5 57908f5553a649a65e751f518ce4bcf5 gcc-3.3.2.ebuild 16872 MD5 bb25db362249d8150777b7209e7e416e gcc-3.3.2-r7.ebuild 21767 @@ -11,7 +12,6 @@ MD5 582859af3130351807d9b7bd06e8e3ab gcc-3.3.2-r4.ebuild 20663 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 MD5 9f2b75a5738fb492bdd6a50db9b1c8a0 gcc-3.2.3-r4.ebuild 19754 MD5 9d2f881e949534e2585b5b1e32b8edf9 gcc-3.1.1-r2.ebuild 9274 -MD5 45f62039d481b9cc9e09252341289af1 gcc-3.4.1.ebuild 30206 MD5 8ebed4f0b845ee278f3e5b6f95b6d8e9 gcc-3.4.2-r2.ebuild 13905 MD5 5b1ba0c0deb15946966fc6ed977ba93f ChangeLog 69975 MD5 e14910e8f2d858bf6765fb70b948e5c5 gcc-3.4.1-r3.ebuild 31282 diff --git a/sys-devel/gcc/gcc-3.3.3.ebuild b/sys-devel/gcc/gcc-3.3.3.ebuild index 03ed2cb6ba87..54b3f29f5767 100644 --- a/sys-devel/gcc/gcc-3.3.3.ebuild +++ b/sys-devel/gcc/gcc-3.3.3.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3.ebuild,v 1.14 2004/08/25 13:55:48 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.3.ebuild,v 1.15 2004/10/06 22:23:29 lv Exp $ IUSE="static nls bootstrap java build X multilib gcj" -inherit eutils flag-o-matic libtool +inherit eutils flag-o-matic libtool versionator # Compile problems with these (bug #6641 among others)... #filter-flags "-fno-exceptions -fomit-frame-pointer -fforce-addr" @@ -38,8 +38,10 @@ strip-flags [ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}" LOC="/usr" -MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`" -MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`" +#MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`" +#MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`" +MY_PV="$(get_version_component_range 1-2)" +MY_PV_FULL="$(get_version_component_range 1-3)" LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}" BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}" diff --git a/sys-devel/gcc/gcc-3.4.1.ebuild b/sys-devel/gcc/gcc-3.4.1.ebuild index 0ac4e0dd28d3..1bdff2978893 100644 --- a/sys-devel/gcc/gcc-3.4.1.ebuild +++ b/sys-devel/gcc/gcc-3.4.1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1.ebuild,v 1.26 2004/10/01 21:45:27 lv Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.4.1.ebuild,v 1.27 2004/10/06 22:23:29 lv Exp $ -inherit eutils flag-o-matic libtool gnuconfig +inherit eutils flag-o-matic libtool gnuconfig versionator # Recently there has been a lot of stability problem in Gentoo-land. Many # things can be the cause to this, but I believe that it is due to gcc3 @@ -52,8 +52,10 @@ do_filter_flags() { [ ! -n "${CCHOST}" ] && export CCHOST="${CHOST}" LOC="/usr" -MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`" -MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`" +#MY_PV="`echo ${PV} | awk -F. '{ gsub(/_pre.*|_alpha.*/, ""); print $1 "." $2 }'`" +#MY_PV_FULL="`echo ${PV} | awk '{ gsub(/_pre.*|_alpha.*/, ""); print $0 }'`" +MY_PV="$(get_version_component_range 1-2)" +MY_PV_FULL="$(get_version_component_range 1-3)" # GCC 3.4 no longer uses gcc-lib. we'll rename this later for compatibility # reasons, as a few things would break without gcc-lib. -- 2.26.2