summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Crête <tester@gentoo.org>2004-06-03 10:22:15 +0000
committerOlivier Crête <tester@gentoo.org>2004-06-03 10:22:15 +0000
commit725f9981eda7920717d85cc09b78210849b0026a (patch)
tree16cda9811ad3f810566cc377130600f395e9b830 /media-libs/libddmpeg
parentVersion bump (Manifest recommit) (diff)
downloadgentoo-2-725f9981eda7920717d85cc09b78210849b0026a.tar.gz
gentoo-2-725f9981eda7920717d85cc09b78210849b0026a.tar.bz2
gentoo-2-725f9981eda7920717d85cc09b78210849b0026a.zip
fixed libddmpeg brokenness on x86, fixes bug #52799
Diffstat (limited to 'media-libs/libddmpeg')
-rw-r--r--media-libs/libddmpeg/ChangeLog5
-rw-r--r--media-libs/libddmpeg/libddmpeg-1.6.ebuild8
2 files changed, 9 insertions, 4 deletions
diff --git a/media-libs/libddmpeg/ChangeLog b/media-libs/libddmpeg/ChangeLog
index 74c038b64980..430818377e8d 100644
--- a/media-libs/libddmpeg/ChangeLog
+++ b/media-libs/libddmpeg/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/libddmpeg
# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libddmpeg/ChangeLog,v 1.3 2004/03/08 20:45:05 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libddmpeg/ChangeLog,v 1.4 2004/06/03 10:22:15 tester Exp $
+
+ 03 Jun 2004; <tester@gentoo.org> libddmpeg-1.6.ebuild:
+ The amd64 test broke building on x86, fixed bug #52799. Also mpu != march.
08 Mar 2004; Jon Portnoy <avenj@gentoo.org> libddmpeg-1.6.ebuild :
A little messy hackery to compile on AMD64.
diff --git a/media-libs/libddmpeg/libddmpeg-1.6.ebuild b/media-libs/libddmpeg/libddmpeg-1.6.ebuild
index b09456dc54f4..d0eb6e1253fc 100644
--- a/media-libs/libddmpeg/libddmpeg-1.6.ebuild
+++ b/media-libs/libddmpeg/libddmpeg-1.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libddmpeg/libddmpeg-1.6.ebuild,v 1.2 2004/03/08 20:45:05 avenj Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libddmpeg/libddmpeg-1.6.ebuild,v 1.3 2004/06/03 10:22:15 tester Exp $
inherit flag-o-matic
@@ -13,13 +13,15 @@ LICENSE="as-is"
KEYWORDS="~x86 ~amd64 -*"
src_compile() {
- local cpu="`get-flag march || get-flag mcpu`"
+ local cpu="`get-flag march`"
if [ -n "${cpu}" ] ; then
sed -e "s:-march=i386:-march=${cpu}:" -i "Makefile" || die "sed failed"
fi
# We don't want -march=i386 but we do want -fPIC. Quick swap...
# - avenj@gentoo.org (8 Mar 04)
- use amd64 && sed -e "s:-march=i386:-fPIC:" -i "Makefile" || die "sed failed"
+ if use amd64; then
+ sed -e "s:-march=i386:-fPIC:" -i "Makefile" || die "sed failed"
+ fi
emake || die "compile problem"
}