PLATFORM patch added

3 files changed, 94 insertions, 2 deletions

diff --git a/net-www/mozilla/ChangeLog b/net-www/mozilla/ChangeLog
index 79fd0a1ff5b3..2fef18ca9991 100644
--- a/net-www/mozilla/ChangeLog
+++ b/net-www/mozilla/ChangeLog
@@ -1,9 +1,17 @@
 # ChangeLog for net-www/mozilla
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.43 2002/10/19 12:41:49 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/ChangeLog,v 1.44 2002/10/24 08:50:24 seemant Exp $
 
 *mozilla-1.0.1-r2 (19 Oct 2002)
 
+  24 Oct 2002; Seemant Kulleen <seemant@gentoo.org> mozilla-1.0.1-r2.ebuild :
+
+  Added a patch to remove reading the PLATFORM environment variable as this
+  broke compilation on sparc64.  This patch was provided by:
+  wtc@netscape.com (Wan-Teh Chang) in this bug report:
+  http://bugzilla.mozilla.org/show_bug.cgi?id=174143 as it is an upstream
+  bugfix.
+
   19 Oct 2002; Martin Schlemmer <azarah@gentoo.org> :
   Add the abi-compat patch back, thanks to Tony Clark.
 
diff --git a/net-www/mozilla/files/mozilla-1.0.1-platform.patch b/net-www/mozilla/files/mozilla-1.0.1-platform.patch
new file mode 100644
index 000000000000..3e3d31e18e9b
--- /dev/null
+++ b/net-www/mozilla/files/mozilla-1.0.1-platform.patch
@@ -0,0 +1,79 @@
+Index: mozilla/security/coreconf/README
+===================================================================
+RCS file: /cvsroot/mozilla/security/coreconf/README,v
+retrieving revision 1.2
+diff -u -r1.2 README
+--- mozilla/security/coreconf/README	27 Dec 2000 00:42:43 -0000	1.2
++++ mozilla/security/coreconf/README	24 Oct 2002 04:44:32 -0000
+@@ -232,9 +232,6 @@
+         $(OS_CONFIG).mk         <architecture>-specific macros
+                                 (dependent upon <architecture> tags)
+ 
+-        platform.mk             source and release <platform> tags 
+-				(dependent upon <architecture> tags)
+-
+         tree.mk                 release <tree> tags 
+ 				(dependent upon <architecture> tags)
+ 
+Index: mozilla/security/coreconf/config.mk
+===================================================================
+RCS file: /cvsroot/mozilla/security/coreconf/config.mk,v
+retrieving revision 1.13
+diff -u -r1.13 config.mk
+--- mozilla/security/coreconf/config.mk	18 May 2002 03:24:14 -0000	1.13
++++ mozilla/security/coreconf/config.mk	24 Oct 2002 04:44:32 -0000
+@@ -70,9 +70,7 @@
+ # [4.0] Master "Core Components" source and release <platform> tags   #
+ #       (dependent upon <architecture> tags)                          #
+ #######################################################################
+-ifndef PLATFORM
+ PLATFORM = $(OBJDIR_NAME)
+-endif
+ 
+ #######################################################################
+ # [5.0] Master "Core Components" release <tree> tags                  #
+Index: mozilla/security/coreconf/platform.mk
+===================================================================
+RCS file: mozilla/security/coreconf/platform.mk
+diff -N mozilla/security/coreconf/platform.mk
+--- mozilla/security/coreconf/platform.mk	31 Mar 2000 18:55:32 -0000	1.1
++++ /dev/null	1 Jan 1970 00:00:00 -0000
+@@ -1,38 +0,0 @@
+-#
+-# The contents of this file are subject to the Mozilla Public
+-# License Version 1.1 (the "License"); you may not use this file
+-# except in compliance with the License. You may obtain a copy of
+-# the License at http://www.mozilla.org/MPL/
+-# 
+-# Software distributed under the License is distributed on an "AS
+-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+-# implied. See the License for the specific language governing
+-# rights and limitations under the License.
+-# 
+-# The Original Code is the Netscape security libraries.
+-# 
+-# The Initial Developer of the Original Code is Netscape
+-# Communications Corporation.  Portions created by Netscape are 
+-# Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+-# Rights Reserved.
+-# 
+-# Contributor(s):
+-# 
+-# Alternatively, the contents of this file may be used under the
+-# terms of the GNU General Public License Version 2 or later (the
+-# "GPL"), in which case the provisions of the GPL are applicable 
+-# instead of those above.  If you wish to allow use of your 
+-# version of this file only under the terms of the GPL and not to
+-# allow others to use your version of this file under the MPL,
+-# indicate your decision by deleting the provisions above and
+-# replace them with the notice and other provisions required by
+-# the GPL.  If you do not delete the provisions above, a recipient
+-# may use your version of this file under either the MPL or the
+-# GPL.
+-#
+-
+-#######################################################################
+-# Master "Core Components" <platform> tag                             #
+-#######################################################################
+-
+-PLATFORM = $(OBJDIR_NAME)
diff --git a/net-www/mozilla/mozilla-1.0.1-r2.ebuild b/net-www/mozilla/mozilla-1.0.1-r2.ebuild
index 2c25914e7f3f..2c456b877ab5 100644
--- a/net-www/mozilla/mozilla-1.0.1-r2.ebuild
+++ b/net-www/mozilla/mozilla-1.0.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.0.1-r2.ebuild,v 1.1 2002/10/19 12:41:49 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mozilla/mozilla-1.0.1-r2.ebuild,v 1.2 2002/10/24 08:50:24 seemant Exp $
 
 IUSE="mozxmlterm moznomail java mozp3p crypt ipv6 gtk2 mozinterfaceinfo ssl ldap mozaccess mozctl gnome mozsvg"
 
@@ -115,6 +115,11 @@ src_unpack() {
 	patch -p1 < ${FILESDIR}/${P}-prefcrash.patch || die
 	patch -p1 < ${FILESDIR}/${P}-xuldom.patch || die
 
+	# A patch for mozilla to disregard the PLATFORM variable, which
+	# can break compiles (has done for sparc64).  See:
+	# http://bugzilla.mozilla.org/show_bug.cgi?id=174143
+	patch -p1 < ${FILESDIR}/${P}-platform.patch || die
+
 	# Unpack the enigmail plugin
 	if [ -n "`use crypt`" -a -z "`use moznomail`" ] && \
 	   [ "${NO_MAIL}" != "YES" -a "${NO_MAIL}" != "yes" ]