summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Tilley <lv@gentoo.org>2004-07-06 19:30:47 +0000
committerTravis Tilley <lv@gentoo.org>2004-07-06 19:30:47 +0000
commitfa3b378cc395fcf654609495e842265c439bb72a (patch)
tree39d16514362273570a61777dd6c2316147a957b1 /media-libs
parentfixo (Manifest recommit) (diff)
downloadgentoo-2-fa3b378cc395fcf654609495e842265c439bb72a.tar.gz
gentoo-2-fa3b378cc395fcf654609495e842265c439bb72a.tar.bz2
gentoo-2-fa3b378cc395fcf654609495e842265c439bb72a.zip
cleaned up gcc 3.4.x fixes to re-close bug 55202
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/xine-lib/ChangeLog6
-rw-r--r--media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild11
-rw-r--r--media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild12
3 files changed, 21 insertions, 8 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 24b92069aa06..f024fb064c83 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/xine-lib
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.131 2004/06/29 22:47:00 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.132 2004/07/06 19:30:47 lv Exp $
+
+ 06 Jul 2004; Travis Tilley <lv@gentoo.org> xine-lib-1_rc4-r1.ebuild,
+ xine-lib-1_rc5-r2.ebuild:
+ cleaned up gcc 3.4.x fixes to re-close bug 55202
30 Jun 2004; Michael Hanselmann <hansmi@gentoo.org>
xine-lib-1_rc5-r2.ebuild:
diff --git a/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild b/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild
index 183e43d06459..5386a0eb10b8 100644
--- a/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc4-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/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild,v 1.18 2004/06/29 19:33:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc4-r1.ebuild,v 1.19 2004/07/06 19:30:47 lv Exp $
inherit eutils flag-o-matic gcc libtool
@@ -84,9 +84,14 @@ src_compile() {
filter-flags -momit-leaf-frame-pointer #46339
filter-flags -funroll-all-loops #55420
filter-flags -fno-unit-at-a-time #55202
- [ "`gcc-fullversion`" == "3.4.0" ] && append-flags -fno-web #49509
- is-flag -O? || append-flags -O1 #31243
+ if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
+ append-flags -fno-web #49509
+ filter-flags -fno-unit-at-a-time #55202
+ append-flags -funit-at-a-time #55202
+ fi
+
+ replace-flags -O0 -O1 #31243
# fix build errors with sse2 #49482
if use x86 ; then
diff --git a/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild b/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild
index c65e1cc2031b..b3e27d4cad7c 100644
--- a/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc5-r2.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/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild,v 1.8 2004/06/30 01:20:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc5-r2.ebuild,v 1.9 2004/07/06 19:30:47 lv Exp $
inherit eutils flag-o-matic gcc libtool
@@ -83,10 +83,14 @@ src_compile() {
filter-flags -fforce-addr
filter-flags -momit-leaf-frame-pointer #46339
filter-flags -funroll-all-loops #55420
- filter-flags -fno-unit-at-a-time #55202
- [ "`gcc-fullversion`" == "3.4.0" ] && append-flags -fno-web #49509
- is-flag -O? || append-flags -O1 #31243
+ if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
+ append-flags -fno-web #49509
+ filter-flags -fno-unit-at-a-time #55202
+ append-flags -funit-at-a-time #55202
+ fi
+
+ replace-flags -O0 -O1 #31243
# fix build errors with sse2 #49482
if use x86 ; then