summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Tilley <lv@gentoo.org>2004-07-14 23:32:48 +0000
committerTravis Tilley <lv@gentoo.org>2004-07-14 23:32:48 +0000
commitf44e4f06e5582b3fea4b7ad3e4a01453e0d057e1 (patch)
tree44a055545362795d7a4e28b5bfba19f9a745e47f /net-analyzer/tcpdump
parentsync IUSE (+debug) (Manifest recommit) (diff)
downloadgentoo-2-f44e4f06e5582b3fea4b7ad3e4a01453e0d057e1.tar.gz
gentoo-2-f44e4f06e5582b3fea4b7ad3e4a01453e0d057e1.tar.bz2
gentoo-2-f44e4f06e5582b3fea4b7ad3e4a01453e0d057e1.zip
fix gcc 3.4 fix so that it works with gcc 3.4.1 too
Diffstat (limited to 'net-analyzer/tcpdump')
-rw-r--r--net-analyzer/tcpdump/ChangeLog5
-rw-r--r--net-analyzer/tcpdump/tcpdump-3.8.3-r1.ebuild8
2 files changed, 10 insertions, 3 deletions
diff --git a/net-analyzer/tcpdump/ChangeLog b/net-analyzer/tcpdump/ChangeLog
index bd3b8f5305fd..0382be1a3f36 100644
--- a/net-analyzer/tcpdump/ChangeLog
+++ b/net-analyzer/tcpdump/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-analyzer/tcpdump
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.30 2004/06/24 22:20:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/ChangeLog,v 1.31 2004/07/14 23:32:48 lv Exp $
+
+ 14 Jul 2004; Travis Tilley <lv@gentoo.org> tcpdump-3.8.3-r1.ebuild:
+ fix gcc 3.4 fix so that it works with gcc 3.4.1 too
27 Apr 2004; Aron Griffis <agriffis@gentoo.org> tcpdump-3.7.2.ebuild:
Add inherit eutils
diff --git a/net-analyzer/tcpdump/tcpdump-3.8.3-r1.ebuild b/net-analyzer/tcpdump/tcpdump-3.8.3-r1.ebuild
index 6977eb9aa547..83c4a4b7b8e8 100644
--- a/net-analyzer/tcpdump/tcpdump-3.8.3-r1.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-3.8.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.8.3-r1.ebuild,v 1.12 2004/06/24 22:20:04 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/tcpdump/tcpdump-3.8.3-r1.ebuild,v 1.13 2004/07/14 23:32:48 lv Exp $
inherit flag-o-matic gcc
@@ -21,7 +21,11 @@ DEPEND=">=net-libs/libpcap-0.8.3-r1
src_compile() {
replace-flags -O[3-9] -O2
filter-flags -finline-functions
- [ "`gcc-fullversion`" == "3.4.0" ] && append-flags -fno-unit-at-a-time
+
+ if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
+ filter-flags -funit-at-a-time
+ append-flags -fno-unit-at-a-time #48747
+ fi
econf `use_with ssl crypto` `use_enable ipv6` || die
make CCOPT="$CFLAGS" || die