Another fix to alpha/ia64 CFLAGS handling

4 files changed, 48 insertions, 40 deletions

diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index fc00ff93a025..b687e244a0cc 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.133 2003/11/20 16:25:33 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.134 2003/11/21 20:20:43 agriffis Exp $
+
+  21 Nov 2003; Aron Griffis <agriffis@gentoo.org> mozilla-1.5-r1.ebuild,
+  mozilla-1.6a.ebuild:
+  Another fix to alpha/ia64 CFLAGS handling
 
 *mozilla-1.6a (20 Nov 2003)
 
diff --git a/net-www/mozilla/Manifest b/net-www/mozilla/Manifest
index 22a965285828..4424a64e0f44 100644
--- a/net-www/mozilla/Manifest
+++ b/net-www/mozilla/Manifest
@@ -1,44 +1,44 @@
-MD5 67e48a7faad782acdccb65d5a7168a84 ChangeLog 23313
-MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
-MD5 3d428c2cf97c36c769ff7ac419996aa5 mozilla-1.3-r2.ebuild 16750
+MD5 de44ac83088bb65af6f33b79da7d5b0e ChangeLog 23458
+MD5 c0b2575e1d78e580ce4a2d6577b27be1 mozilla-1.5-r1.ebuild 16918
+MD5 1e61ec5a5d9efbacd2135c3c55dd4080 mozilla-1.6a.ebuild 16919
 MD5 b8036fc580046725c243d8faf9753808 mozilla-1.4-r3.ebuild 16729
 MD5 ae6f8c3a96767d491dd65c111d6340cc mozilla-1.4-r4.ebuild 17265
-MD5 f24b7db89d2f74e9065e1bf4dd9061c4 mozilla-1.4.1.ebuild 17256
-MD5 5d2740bf164e0ab51ce102dff6c549e4 mozilla-1.5-r1.ebuild 16907
+MD5 3d428c2cf97c36c769ff7ac419996aa5 mozilla-1.3-r2.ebuild 16750
 MD5 6e8e847d464feea0e901b10f7e321099 mozilla-1.5.ebuild 16429
-MD5 2114130c5bff7f89514e6912ea0d0e3e mozilla-1.6a.ebuild 16894
+MD5 f24b7db89d2f74e9065e1bf4dd9061c4 mozilla-1.4.1.ebuild 17256
+MD5 ce23390351fe8020387d93ee29e09a3d metadata.xml 160
 MD5 2245cc4f37902e2c6dd188f72874fbb3 files/10mozilla 60
-MD5 3cbe151665ba43403e657607949244e8 files/digest-mozilla-1.3-r2 201
 MD5 965c8430aca20b99db6430555624b4d2 files/digest-mozilla-1.4-r3 201
-MD5 3fc638d05bf40a6d7a5d3296ee2a0449 files/digest-mozilla-1.4-r4 201
-MD5 28cbb765c235caf88a998f8a413d29f3 files/digest-mozilla-1.4.1 196
-MD5 14ab5596f8ab82d99af369a72d6c7d6e files/digest-mozilla-1.5 201
-MD5 75e7de2ef297a2260862175d3289cb45 files/digest-mozilla-1.5-r1 201
-MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
-MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
+MD5 8c884b095f6624cda1c74bcf98624517 files/digest-mozilla-1.6a 202
+MD5 3cbe151665ba43403e657607949244e8 files/digest-mozilla-1.3-r2 201
 MD5 766df4cd7332bf4127847985f98e46ec files/gtk2mozilla_head_patch2 27148
 MD5 fec6b616b0fec2ee53d64edc2dbfa03c files/mozilla 134
-MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-1.4-amd64.patch 35052
 MD5 23d6b685fd5e49a07cc4a1786871bf47 files/mozilla-alpha-xpcom-subs-fix.patch 4953
 MD5 df4a4bc60d8f5d28c801ccedfea84d70 files/mozilla-ft-bytecode.patch 629
 MD5 296fe1fa9c5b387bcd909f0a128c7a16 files/mozilla-new-freetype2.patch 720
 MD5 d2a2c551fe8991a27d4abe4e3bbedbe3 files/mozilla-xft-unix-prefs.patch 1320
 MD5 5b01d0425f9ef7bbe0765985e6041c6b files/mozilla.sh 6684
+MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
+MD5 3fc638d05bf40a6d7a5d3296ee2a0449 files/digest-mozilla-1.4-r4 201
 MD5 7d244b888dbd302c14414cbfc1f62501 files/xft.js 135
-MD5 8c884b095f6624cda1c74bcf98624517 files/digest-mozilla-1.6a 202
+MD5 e30291e992d71bccac5937cca9696da0 files/enigmail-Makefile 1560
+MD5 14ab5596f8ab82d99af369a72d6c7d6e files/digest-mozilla-1.5 201
+MD5 f0e9adeb0454377ce019e8969e644efb files/mozilla-1.4-amd64.patch 35052
+MD5 28cbb765c235caf88a998f8a413d29f3 files/digest-mozilla-1.4.1 196
+MD5 75e7de2ef297a2260862175d3289cb45 files/digest-mozilla-1.5-r1 201
 MD5 8803e1d528f2f49a3f3fa98ba14d9ff0 files/1.2/mozilla-1.2-branch-update.patch.bz2 8240
 MD5 83da5242120c74b0ca6cceae9d6cf237 files/1.2/mozilla-1.2-cutnpaste-limit-fix.patch.bz2 2838
-MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
-MD5 d63b3ff6f56728d85392ac75a9745a15 files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 605
 MD5 9ec98639ee6359407ab5150486c3d0d1 files/1.2/mozilla-1.2b-Xft-includes.patch.bz2 387
 MD5 fd94ea7ab54ecfd812c46fa5ce53cd0e files/1.2/mozilla-1.2b-default-plugin-less-annoying.patch.bz2 1030
 MD5 025a72a791c12f7c3f50e59fc63db451 files/1.2/mozilla-1.2b-freetype.patch.bz2 854
 MD5 696d4810f2ccb8f2bcb0275fa13c67b9 files/1.2/mozilla-1.2b-gtk2.patch.bz2 6091
 MD5 9bb311174360a35555ae82617d33bc3f files/1.2/mozilla-1.2b-over-the-spot.patch.bz2 320
 MD5 b94275225c24a9776a85f33734c8a7eb files/1.2/mozilla-1.2b-wallet.patch.bz2 396
+MD5 d63b3ff6f56728d85392ac75a9745a15 files/1.2/mozilla-1.2.1-Xrender-includes.patch.bz2 605
+MD5 4877db25d49b916e55a5d11238c63d8c files/1.2/mozilla-1.2-image-reload-memleak.patch 1489
 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
+MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
 MD5 1655fea18e9fc538b41d88561d6080c7 files/1.3/mozilla-1.3-fix-gtkim.patch 921
 MD5 491741624c0aee888ea4a6824b979c3c files/1.3/mozilla-1.3-gtk2.patch 17387
-MD5 82ebd0eb0bf87f9ddb11e686904d2633 files/1.3/mozilla-1.3-provider-shutdown.patch 4754
 MD5 e30291e992d71bccac5937cca9696da0 files/enigmail/Makefile-enigmail 1560
 MD5 68a7617a6d3f0f37904cd6aaa90fe1ba files/enigmail/Makefile-ipc 1596
diff --git a/net-www/mozilla/mozilla-1.5-r1.ebuild b/net-www/mozilla/mozilla-1.5-r1.ebuild
index 7c00b66af88a..7bad4c25538d 100644
--- a/net-www/mozilla/mozilla-1.5-r1.ebuild
+++ b/net-www/mozilla/mozilla-1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.5-r1.ebuild,v 1.4 2003/11/20 15:58:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.5-r1.ebuild,v 1.5 2003/11/21 20:20:43 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug"
 # Internal USE flags that I do not really want to advertise ...
@@ -339,14 +339,16 @@ src_compile() {
 	# Get it to work without warnings on gcc3
 	export CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
 
-	# On amd64 we statically set 'safe' CFLAGS. Use those only.
-	# using the standard -O2 will cause segfaults on startup for amd64
-	if [ "${ARCH}" = "amd64" ]
-	then
-		ENABLE_OPTIMIZE="${CFLAGS}"
-	else
-		ENABLE_OPTIMIZE="-O2"
-	fi
+	# On 64-bit we statically set 'safe' CFLAGS. Use those only.
+	# using the standard -O2 will cause segfaults on startup
+	case "${ARCH}" in
+		alpha|amd64|ia64)
+			ENABLE_OPTIMIZE="${CFLAGS}"
+			;;
+		*)
+			ENABLE_OPTIMIZE="-O2"
+			;;
+	esac
 
 	cd ${S}
 	einfo "Configuring Mozilla..."
diff --git a/net-www/mozilla/mozilla-1.6a.ebuild b/net-www/mozilla/mozilla-1.6a.ebuild
index dd63077e9e3d..7a4e67405b26 100644
--- a/net-www/mozilla/mozilla-1.6a.ebuild
+++ b/net-www/mozilla/mozilla-1.6a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.6a.ebuild,v 1.1 2003/11/20 16:25:33 brad Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.6a.ebuild,v 1.2 2003/11/21 20:20:43 agriffis Exp $
 
 IUSE="java crypt ipv6 gtk2 ssl ldap gnome debug"
 # Internal USE flags that I do not really want to advertise ...
@@ -22,9 +22,9 @@ append-flags -s -fforce-addr
 case "${ARCH}" in
 	alpha|ia64)
 		# Anything more than this causes segfaults on startup on 64-bit
-		# (but 33767)
-		export CFLAGS="${CFLAGS//-O?/-O} -Wall -fPIC -pipe"
-		export CXXFLAGS="${CXXFLAGS//-O?/-O} -Wall -fPIC -pipe"
+		# (bug 33767)
+		export CFLAGS="${CFLAGS//-O[1-9s]/-O} -Wall -fPIC -pipe"
+		export CXXFLAGS="${CXXFLAGS//-O[1-9s]/-O} -Wall -fPIC -pipe"
 		;;
 	amd64)
 		# Anything more than this causes segfaults on startup on amd64
@@ -339,14 +339,16 @@ src_compile() {
 	# Get it to work without warnings on gcc3
 	export CXXFLAGS="${CXXFLAGS} -Wno-deprecated"
 
-	# On amd64 we statically set 'safe' CFLAGS. Use those only.
-	# using the standard -O2 will cause segfaults on startup for amd64
-	if [ "${ARCH}" = "amd64" ]
-	then
-		ENABLE_OPTIMIZE="${CFLAGS}"
-	else
-		ENABLE_OPTIMIZE="-O2"
-	fi
+	# On 64-bit we statically set 'safe' CFLAGS. Use those only.
+	# using the standard -O2 will cause segfaults on startup
+	case "${ARCH}" in
+		alpha|amd64|ia64)
+			ENABLE_OPTIMIZE="${CFLAGS}"
+			;;
+		*)
+			ENABLE_OPTIMIZE="-O2"
+			;;
+	esac
 
 	cd ${S}
 	einfo "Configuring Mozilla..."