diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-09-11 06:57:39 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-09-11 06:57:39 +0000 |
| commit | cfd970b5ffaae50f118d54a1d973ee72caeb5219 (patch) | |
| tree | 51134b9334e2b12340fb0cf6d5736e985d493f21 /media-libs | |
| parent | Version bump. (diff) | |
| download | gentoo-2-cfd970b5ffaae50f118d54a1d973ee72caeb5219.tar.gz gentoo-2-cfd970b5ffaae50f118d54a1d973ee72caeb5219.tar.bz2 gentoo-2-cfd970b5ffaae50f118d54a1d973ee72caeb5219.zip | |
Disable assembly code for x32 ABI for now #421841 by Xavier Miller.
(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/xvid/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/xvid/xvid-1.3.2.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog index 06cf16d4cb93..16f16428f14e 100644 --- a/media-libs/xvid/ChangeLog +++ b/media-libs/xvid/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/xvid # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.133 2012/03/06 20:52:32 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.134 2012/09/11 06:57:39 vapier Exp $ + + 11 Sep 2012; Mike Frysinger <vapier@gentoo.org> xvid-1.3.2.ebuild: + Disable assembly code for x32 ABI for now #421841 by Xavier Miller. 06 Mar 2012; Brent Baude <ranger@gentoo.org> xvid-1.3.2.ebuild: Marking xvid-1.3.2 ppc for bug 399849 @@ -491,4 +494,3 @@ Fixed the DEPEND .. we cannot depend on nasm for other archs than x86. Also do not install if media-libs/divx4linux is installed. Fixed examples to install into doc dir. - diff --git a/media-libs/xvid/xvid-1.3.2.ebuild b/media-libs/xvid/xvid-1.3.2.ebuild index 6a4007c1bc64..97627489912f 100644 --- a/media-libs/xvid/xvid-1.3.2.ebuild +++ b/media-libs/xvid/xvid-1.3.2.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/xvid/xvid-1.3.2.ebuild,v 1.8 2012/03/06 20:52:32 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.3.2.ebuild,v 1.9 2012/09/11 06:57:39 vapier Exp $ EAPI=2 inherit flag-o-matic multilib @@ -31,7 +31,9 @@ src_configure() { use sparc && append-cflags -mno-vis #357149 local myconf - use pic && myconf="--disable-assembly" + if use pic || [[ ${ABI} == "x32" ]] ; then #421841 + myconf="--disable-assembly" + fi econf ${myconf} \ $(use_enable threads pthread) |