-Os to -O2 on x86

6 files changed, 11 insertions, 133 deletions

diff --git a/sys-devel/bc/ChangeLog b/sys-devel/bc/ChangeLog
index 6749d84878db..d83bb4ac4690 100644
--- a/sys-devel/bc/ChangeLog
+++ b/sys-devel/bc/ChangeLog
@@ -1,9 +1,13 @@
 # ChangeLog for sys-devel/bc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/ChangeLog,v 1.9 2003/02/20 10:11:10 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/ChangeLog,v 1.10 2003/03/15 02:12:01 seemant Exp $
 
 *bc-1.06-r5 (19 Feb 2003)
 
+  14 Mar 2003; Seemant Kulleen <seemant@gentoo.org> bc-1.06-r3.ebuild,
+  bc-1.06-r3.ebuild, bc-1.06-r4.ebuild, bc-1.06-r4.ebuild, bc-1.06-r5.ebuild:
+  change -Os to -O2 on x86.  Closes bug #17536 by frank <frbiscani@libero.it>
+
   19 Feb 2003; Mark Guertin <gerk@gentoo.org> bc-1.06-r5.ebuild 
   files/digest-bc-1.06-r5 :
   rev bump to close bug #16043, -O2 on ppc causes segfault.  
diff --git a/sys-devel/bc/bc-1.06-r3.ebuild b/sys-devel/bc/bc-1.06-r3.ebuild
deleted file mode 100644
index e1d609b804ac..000000000000
--- a/sys-devel/bc/bc-1.06-r3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/bc-1.06-r3.ebuild,v 1.15 2003/02/13 16:26:33 vapier Exp $
-
-IUSE="readline"
-      
-S="${WORKDIR}/${P}"
-DESCRIPTION="Handy console-based calculator utility"
-SRC_URI="ftp://prep.ai.mit.edu/pub/gnu/bc/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/bc/bc.html"
-
-LICENSE="GPL-2 & LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha"
-
-RDEPEND="readline? ( >=sys-libs/readline-4.1 
-	>=sys-libs/ncurses-5.2 )"
-DEPEND="$RDEPEND sys-devel/flex"
-
-src_unpack() {
-
-	unpack ${A} ; cd ${S}
-
-	patch -p1 < ${FILESDIR}/bc-1.06-info-fix.diff || die
-	patch -p1 < ${FILESDIR}/bc-1.06-readline42.diff || die
-
-	# Command line arguments for flex changed from the old
-	# 2.5.4 to 2.5.22, so fix configure if we are using the
-	# new flex.
-	# <azarah@gentoo.org> (23 Oct 2002)
-	local flmajor="`flex --version | cut -d. -f1`"
-	local flminor="`flex --version | cut -d. -f2`"
-	local flmicro="`flex --version | cut -d. -f3`"
-	if [ "${flmajor/flex }" -ge 2 -a \
-	     "${flminor/flex }" -ge 5 -a \
-	     "${flmicro/flex }" -ge 22 ]
-	then
-		cd ${S}; cp configure configure.orig
-		sed -e 's:flex -I8:flex -I:g' \
-			configure.orig > configure
-	fi
-}
-
-src_compile() {
-
-	local myconf=""
-	use readline && myconf="--with-readline"
-
-	econf ${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-
-	into /usr
-	dobin bc/bc dc/dc
-
-	doinfo doc/*.info
-	doman doc/*.1
-	dodoc AUTHORS COPYING* FAQ NEWS README ChangeLog
-}
-
diff --git a/sys-devel/bc/bc-1.06-r4.ebuild b/sys-devel/bc/bc-1.06-r4.ebuild
deleted file mode 100644
index 0ce5d1debef6..000000000000
--- a/sys-devel/bc/bc-1.06-r4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/bc-1.06-r4.ebuild,v 1.6 2003/02/20 10:11:10 zwelch Exp $
-
-IUSE="readline"
-      
-S="${WORKDIR}/${P}"
-DESCRIPTION="Handy console-based calculator utility"
-SRC_URI="ftp://prep.ai.mit.edu/pub/gnu/bc/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/bc/bc.html"
-
-LICENSE="GPL-2 & LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa arm"
-
-RDEPEND="readline? ( >=sys-libs/readline-4.1 
-	>=sys-libs/ncurses-5.2 )"
-DEPEND="$RDEPEND sys-devel/flex"
-
-src_unpack() {
-
-	unpack ${A} ; cd ${S}
-
-	patch -p1 < ${FILESDIR}/bc-1.06-info-fix.diff || die
-	patch -p1 < ${FILESDIR}/bc-1.06-readline42.diff || die
-
-	# Command line arguments for flex changed from the old
-	# 2.5.4 to 2.5.22, so fix configure if we are using the
-	# new flex.  Note that flex-2.5.4 prints 'flex version 2.5.4'
-	# and flex-2.5.22 prints 'flex 2.5.22', bug #10546.
-	# <azarah@gentoo.org> (23 Oct 2002)
-	local flmajor="`flex --version | cut -d. -f1`"
-	local flminor="`flex --version | cut -d. -f2`"
-	local flmicro="`flex --version | cut -d. -f3`"
-	if [ "${flmajor/flex* }" -ge 2 -a \
-	     "${flminor/flex* }" -ge 5 -a \
-	     "${flmicro/flex* }" -ge 22 ]
-	then
-		cd ${S}; cp configure configure.orig
-		sed -e 's:flex -I8:flex -I:g' \
-			configure.orig > configure
-	fi
-}
-
-src_compile() {
-
-	local myconf=""
-	use readline && myconf="--with-readline"
-
-	econf ${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-
-	into /usr
-	dobin bc/bc dc/dc
-
-	doinfo doc/*.info
-	doman doc/*.1
-	dodoc AUTHORS COPYING* FAQ NEWS README ChangeLog
-}
-
diff --git a/sys-devel/bc/bc-1.06-r5.ebuild b/sys-devel/bc/bc-1.06-r5.ebuild
index 00ad1ff1223c..6d50274101f3 100644
--- a/sys-devel/bc/bc-1.06-r5.ebuild
+++ b/sys-devel/bc/bc-1.06-r5.ebuild
@@ -1,18 +1,18 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/bc-1.06-r5.ebuild,v 1.2 2003/02/20 10:11:10 zwelch Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/bc/bc-1.06-r5.ebuild,v 1.3 2003/03/15 02:12:01 seemant Exp $
 
 IUSE="readline"
 
 inherit flag-o-matic
 
-S="${WORKDIR}/${P}"
+S=${WORKDIR}/${P}
 DESCRIPTION="Handy console-based calculator utility"
 SRC_URI="ftp://prep.ai.mit.edu/pub/gnu/bc/${P}.tar.gz"
 HOMEPAGE="http://www.gnu.org/software/bc/bc.html"
 
-LICENSE="GPL-2 & LGPL-2.1"
 SLOT="0"
+LICENSE="GPL-2 & LGPL-2.1"
 KEYWORDS="x86 ppc sparc alpha hppa arm"
 
 RDEPEND="readline? ( >=sys-libs/readline-4.1 
@@ -48,6 +48,9 @@ src_compile() {
 
 	# -O2 causes segafults on ppc with zero backtrace :/
 	use ppc && filter-flags "-O2"
+
+	# -Os causes segfaults on x86
+	use x86 && replace-flags "-Os" "-O2"
 	local myconf=""
 	use readline && myconf="--with-readline"
 
diff --git a/sys-devel/bc/files/digest-bc-1.06-r3 b/sys-devel/bc/files/digest-bc-1.06-r3
deleted file mode 100644
index e470cb55f0e4..000000000000
--- a/sys-devel/bc/files/digest-bc-1.06-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d44b5dddebd8a7a7309aea6c36fda117 bc-1.06.tar.gz 278926
diff --git a/sys-devel/bc/files/digest-bc-1.06-r4 b/sys-devel/bc/files/digest-bc-1.06-r4
deleted file mode 100644
index e470cb55f0e4..000000000000
--- a/sys-devel/bc/files/digest-bc-1.06-r4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d44b5dddebd8a7a7309aea6c36fda117 bc-1.06.tar.gz 278926