diff options
| author |   Martin Schlemmer <azarah@gentoo.org> | 2004-02-11 20:43:22 +0000 |
|---|---|---|
| committer | Martin Schlemmer <azarah@gentoo.org> | 2004-02-11 20:43:22 +0000 |
| commit | 1e42c429bd9a5a04dc74359ee0d0fa5cf6464072 (patch) | |
| tree | 0b83441e0310660ada492574958bdb2aa24b1125 /sys-devel | |
| parent | change edit_threads URL, thanks to Tom Knight-Markiegi in bug 38320 (Manifest... (diff) | |
| download | gentoo-2-1e42c429bd9a5a04dc74359ee0d0fa5cf6464072.tar.gz gentoo-2-1e42c429bd9a5a04dc74359ee0d0fa5cf6464072.tar.bz2 gentoo-2-1e42c429bd9a5a04dc74359ee0d0fa5cf6464072.zip | |
Fix tweaking of -O gcc flag, bug #40863.
Diffstat (limited to 'sys-devel')
| -rw-r--r-- | sys-devel/gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-3.3.2-r5.ebuild | 12 | ||||
| -rw-r--r-- | sys-devel/gcc/gcc-3.3.2-r7.ebuild | 12 |
3 files changed, 19 insertions, 11 deletions
diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog index c4136208bbcd..10011529397c 100644 --- a/sys-devel/gcc/ChangeLog +++ b/sys-devel/gcc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-devel/gcc # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.172 2004/02/10 21:51:16 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.173 2004/02/11 20:43:22 azarah Exp $ + + 11 Feb 2004; Martin Schlemmer <azarah@gentoo.org> gcc-3.3.2-r5.ebuild, + gcc-3.3.2-r7.ebuild: + Fix tweaking of -O gcc flag, bug #40863. 10 Feb 2004; Seemant Kulleen <seemant@gentoo.org> files/fix_libtool_files.sh: diff --git a/sys-devel/gcc/gcc-3.3.2-r5.ebuild b/sys-devel/gcc/gcc-3.3.2-r5.ebuild index dd70fc763f32..272f06d184b5 100644 --- a/sys-devel/gcc/gcc-3.3.2-r5.ebuild +++ b/sys-devel/gcc/gcc-3.3.2-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2-r5.ebuild,v 1.8 2004/02/07 05:46:58 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2-r5.ebuild,v 1.9 2004/02/11 20:43:22 azarah Exp $ IUSE="static nls bootstrap java build X multilib" @@ -368,10 +368,12 @@ src_compile() { [ "${ARCH}" = "hppa" ] && myconf="${myconf} --enable-sjlj-exceptions" # In general gcc does not like optimization, and add -O2 where - # it is safe. This is especially true for gcc-3.3 ... - export CFLAGS="${CFLAGS/-O?/-O2}" - export CXXFLAGS="${CXXFLAGS/-O?/-O2}" - export GCJFLAGS="${CFLAGS/-O?/-O2}" + export CFLAGS="$(echo "${CFLAGS}" | sed -e 's|-O[0123456789]\?|-O2|g')" + einfo "CFLAGS=\"${CFLAGS}\"" + export CXXFLAGS="$(echo "${CXXFLAGS}" | sed -e 's|-O[0123456789]\?|-O2|g')" + einfo "CXXFLAGS=\"${CXXFLAGS}\"" + export GCJFLAGS="$(echo "${GCJFLAGS}" | sed -e 's|-O[0123456789]\?|-O2|g')" + einfo "GCJFLAGS=\"${GCJFLAGS}\"" # Build in a separate build tree mkdir -p ${WORKDIR}/build diff --git a/sys-devel/gcc/gcc-3.3.2-r7.ebuild b/sys-devel/gcc/gcc-3.3.2-r7.ebuild index d6e2560562a8..a26424d81ace 100644 --- a/sys-devel/gcc/gcc-3.3.2-r7.ebuild +++ b/sys-devel/gcc/gcc-3.3.2-r7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2-r7.ebuild,v 1.2 2004/02/10 13:12:33 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.3.2-r7.ebuild,v 1.3 2004/02/11 20:43:22 azarah Exp $ IUSE="static nls bootstrap java build X multilib" @@ -395,10 +395,12 @@ src_compile() { [ "${ARCH}" = "hppa" ] && myconf="${myconf} --enable-sjlj-exceptions" # In general gcc does not like optimization, and add -O2 where - # it is safe. This is especially true for gcc-3.3 ... - export CFLAGS="${CFLAGS/-O?/-O2}" - export CXXFLAGS="${CXXFLAGS/-O?/-O2}" - export GCJFLAGS="${CFLAGS/-O?/-O2}" + export CFLAGS="$(echo "${CFLAGS}" | sed -e 's|-O[0123456789]\?|-O2|g')" + einfo "CFLAGS=\"${CFLAGS}\"" + export CXXFLAGS="$(echo "${CXXFLAGS}" | sed -e 's|-O[0123456789]\?|-O2|g')" + einfo "CXXFLAGS=\"${CXXFLAGS}\"" + export GCJFLAGS="$(echo "${GCJFLAGS}" | sed -e 's|-O[0123456789]\?|-O2|g')" + einfo "GCJFLAGS=\"${GCJFLAGS}\"" # Build in a separate build tree mkdir -p ${WORKDIR}/build |