summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2004-04-28 06:47:07 +0000
committerMike Frysinger <vapier@gentoo.org>2004-04-28 06:47:07 +0000
commit0a0c76f000a8802f08c75e0083252c22aff92f83 (patch)
treeaa8f1897a73be579da917f7120699d467a436344 /net-analyzer/ethereal
parentcleanup (diff)
downloadgentoo-2-0a0c76f000a8802f08c75e0083252c22aff92f83.tar.gz
gentoo-2-0a0c76f000a8802f08c75e0083252c22aff92f83.tar.bz2
gentoo-2-0a0c76f000a8802f08c75e0083252c22aff92f83.zip
gcc-3.4 patch #49238
Diffstat (limited to 'net-analyzer/ethereal')
-rw-r--r--net-analyzer/ethereal/ChangeLog5
-rw-r--r--net-analyzer/ethereal/ethereal-0.10.3.ebuild6
-rw-r--r--net-analyzer/ethereal/files/0.10.3-gcc34.patch11
3 files changed, 19 insertions, 3 deletions
diff --git a/net-analyzer/ethereal/ChangeLog b/net-analyzer/ethereal/ChangeLog
index 0103f8ec6821..d2957ace23dc 100644
--- a/net-analyzer/ethereal/ChangeLog
+++ b/net-analyzer/ethereal/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/ethereal
# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.59 2004/03/31 18:57:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ChangeLog,v 1.60 2004/04/28 06:47:06 vapier Exp $
+
+ 28 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
+ Add gcc-3.4 patch #49238 by Robert Moss.
31 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> ethereal-0.10.2.ebuild:
inherit flag-o-matic for replace-flags; move replace-flags into function
diff --git a/net-analyzer/ethereal/ethereal-0.10.3.ebuild b/net-analyzer/ethereal/ethereal-0.10.3.ebuild
index 2d5921190fdf..e3f46febd769 100644
--- a/net-analyzer/ethereal/ethereal-0.10.3.ebuild
+++ b/net-analyzer/ethereal/ethereal-0.10.3.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.3.ebuild,v 1.6 2004/04/06 03:08:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/ethereal/ethereal-0.10.3.ebuild,v 1.7 2004/04/28 06:47:06 vapier Exp $
-inherit libtool flag-o-matic
+inherit libtool flag-o-matic gcc eutils
DESCRIPTION="A commercial-quality network protocol analyzer"
HOMEPAGE="http://www.ethereal.com/"
@@ -36,6 +36,8 @@ src_unpack() {
replace-flags -O3 -O
replace-flags -O2 -O
+ # Fix gcc-3.4 segfault #49238
+ [ "`gcc-fullversion`" == "3.4" ] && epatch ${FILESDIR}/${PV}-gcc34.patch
# running a full elibtoolize seems to break things in this
# package... see bug 41831 (17 Feb 2004 agriffis)
diff --git a/net-analyzer/ethereal/files/0.10.3-gcc34.patch b/net-analyzer/ethereal/files/0.10.3-gcc34.patch
new file mode 100644
index 000000000000..7f7a5d2451c2
--- /dev/null
+++ b/net-analyzer/ethereal/files/0.10.3-gcc34.patch
@@ -0,0 +1,11 @@
+--- epan/Makefile.in.old 2004-03-26 04:05:56.000000000 +0000
++++ epan/Makefile.in 2004-04-23 08:59:22.353604120 +0100
+@@ -1453,7 +1453,7 @@
+ CCLD = $(CC)
+ LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -fno-unroll-loops
+ DIST_SOURCES = $(libethereal_la_SOURCES) $(EXTRA_libethereal_la_SOURCES)
+
+ RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \