fix gcc-2.95.3 build problem

diff --git a/x11-base/xfree/ChangeLog b/x11-base/xfree/ChangeLog
index 420a9c19d0291221cd5d93f1c017695467583446..46d4970827e8344f104bca48c0abdd1bec85bf4f 100644 (file)
--- a/x11-base/xfree/ChangeLog
+++ b/x11-base/xfree/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xfree
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.56 2002/11/03 11:41:20 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/ChangeLog,v 1.57 2002/11/04 11:37:16 azarah Exp $
+
+  4 Nov 2002; Martin Schlemmer <azarah@gentoo.org> xfree-4.2.1-r1.ebuild :
+
+  Do not apply 107_all_4.2.1-gcc32-internal-compiler-error.patch for
+  gcc-2.95.3, as it cause compile to fail, closing bug #10146.
 
 *xfree-4.2.1-r1 (3 Nov 2002)
 

diff --git a/x11-base/xfree/xfree-4.2.1-r1.ebuild b/x11-base/xfree/xfree-4.2.1-r1.ebuild
index ade3236a5568ac72856ee36396a205240017b1eb..c4cae8ef2cc8be27049b376b87dec2552e62d1f8 100644 (file)
--- a/x11-base/xfree/xfree-4.2.1-r1.ebuild
+++ b/x11-base/xfree/xfree-4.2.1-r1.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/x11-base/xfree/xfree-4.2.1-r1.ebuild,v 1.2 2002/11/03 14:19:29 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xfree/xfree-4.2.1-r1.ebuild,v 1.3 2002/11/04 11:37:16 azarah Exp $
 
 IUSE="sse nls mmx truetype 3dnow 3dfx"
 
@@ -185,6 +185,12 @@ src_unpack() {
                        # upload to ibiblio ...
                        [ "${x##*/}" = "019_all_4.2.1-ati-radeon-9000-support.patch.bz2" ] \
                                && popts="${popts} -R"
+
+                       # Do not apply this patch for gcc-2.95.3, as it cause compile to fail,
+                       # closing bug #10146.
+                       [ "`gcc-version`" = "2.95" ] && \
+                       [ "${x##*/}" = "107_all_4.2.1-gcc32-internal-compiler-error.patch.bz2" ] && \
+                               continue
                
                        # Most -p differ for these patches ... im lazy, so shoot me :/
                        while [ "${count}" -lt 5 ]