summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-09-25 03:11:57 +0000
committerMike Frysinger <vapier@gentoo.org>2012-09-25 03:11:57 +0000
commit8fe551de123eaa50dd5af0aee608794945881e2f (patch)
treee3c72b8b9d8217486a68529becfba1bc912fd4be /media-libs/x264/x264-0.0.20120707.ebuild
parentStable ppc ppc64, bug #433351 (diff)
downloadgentoo-2-8fe551de123eaa50dd5af0aee608794945881e2f.tar.gz
gentoo-2-8fe551de123eaa50dd5af0aee608794945881e2f.tar.bz2
gentoo-2-8fe551de123eaa50dd5af0aee608794945881e2f.zip
Disable asm code for x32 so it at least runs #420241 by Xavier Miller.
(Portage version: 2.2.0_alpha131/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/x264/x264-0.0.20120707.ebuild')
-rw-r--r--media-libs/x264/x264-0.0.20120707.ebuild5
1 files changed, 3 insertions, 2 deletions
diff --git a/media-libs/x264/x264-0.0.20120707.ebuild b/media-libs/x264/x264-0.0.20120707.ebuild
index 56a74c81e385..7b54b01778c0 100644
--- a/media-libs/x264/x264-0.0.20120707.ebuild
+++ b/media-libs/x264/x264-0.0.20120707.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20120707.ebuild,v 1.2 2012/09/01 10:21:10 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20120707.ebuild,v 1.3 2012/09/25 03:11:57 vapier Exp $
EAPI=4
@@ -57,6 +57,7 @@ src_prepare() {
fi
# for OSX
sed -i -e "s|-arch x86_64||g" configure || die
+ epatch "${FILESDIR}"/x264-x32.patch #420241
}
src_configure() {
@@ -72,7 +73,7 @@ src_configure() {
# let upstream pick the optimization level by default
use custom-cflags || filter-flags -O?
- if use x86 && use pic; then
+ if use x86 && use pic || [[ ${ABI} == "x32" ]] ; then
myconf+=" --disable-asm"
fi