diff options
| author |   Matt Turner <mattst88@gentoo.org> | 2012-03-14 18:06:52 +0000 |
|---|---|---|
| committer | Matt Turner <mattst88@gentoo.org> | 2012-03-14 18:06:52 +0000 |
| commit | 4bdc16aa7cc756fe9c6ea7079fe74c6b0f8ddd0a (patch) | |
| tree | c3e1847cd836c08734c97da0a4d91c9ab2e2ded9 | |
| parent | Fixed HOMEPAGE. Fixed SRC_URI. Added test. (diff) | |
| download | gentoo-2-4bdc16aa7cc756fe9c6ea7079fe74c6b0f8ddd0a.tar.gz gentoo-2-4bdc16aa7cc756fe9c6ea7079fe74c6b0f8ddd0a.tar.bz2 gentoo-2-4bdc16aa7cc756fe9c6ea7079fe74c6b0f8ddd0a.zip | |
Drop code to disable sse2 if <gcc-4.2 or if MMX is disabled.
(Portage version: 2.1.10.44/cvs/Linux x86_64)
| -rw-r--r-- | x11-libs/pixman/ChangeLog | 5 | ||||
| -rw-r--r-- | x11-libs/pixman/pixman-0.24.4.ebuild | 32 |
2 files changed, 7 insertions, 30 deletions
diff --git a/x11-libs/pixman/ChangeLog b/x11-libs/pixman/ChangeLog index 30b353a64cdf..313e8d64d547 100644 --- a/x11-libs/pixman/ChangeLog +++ b/x11-libs/pixman/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for x11-libs/pixman # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.127 2012/03/03 16:32:21 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.128 2012/03/14 18:06:52 mattst88 Exp $ + + 14 Mar 2012; Matt Turner <mattst88@gentoo.org> pixman-0.24.4.ebuild: + Drop code to disable sse2 if <gcc-4.2 or if MMX is disabled. 03 Mar 2012; Brent Baude <ranger@gentoo.org> pixman-0.24.0.ebuild: Marking pixman-0.24.0 ppc64 stable for bug 394393 diff --git a/x11-libs/pixman/pixman-0.24.4.ebuild b/x11-libs/pixman/pixman-0.24.4.ebuild index d86cb6426e85..319e66e48f07 100644 --- a/x11-libs/pixman/pixman-0.24.4.ebuild +++ b/x11-libs/pixman/pixman-0.24.4.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/x11-libs/pixman/pixman-0.24.4.ebuild,v 1.1 2012/02/24 15:40:33 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.24.4.ebuild,v 1.2 2012/03/14 18:06:52 mattst88 Exp $ EAPI=4 inherit xorg-2 toolchain-funcs versionator @@ -14,35 +14,9 @@ IUSE="altivec iwmmxt mmx neon sse2" pkg_setup() { xorg-2_pkg_setup - local enable_mmx="$(use mmx && echo 1 || echo 0)" - local enable_sse2="$(use sse2 && echo 1 || echo 0)" - - # this block fixes bug #260287 - if use x86; then - if use sse2 && ! $(version_is_at_least "4.2" "$(gcc-version)"); then - ewarn "SSE2 instructions require GCC 4.2 or higher." - ewarn "pixman will be built *without* SSE2 support" - enable_sse2="0" - fi - fi - - local confadd - # this block fixes bug #236558 - case "$enable_mmx,$enable_sse2" in - '1,1') - confadd=(--enable-mmx --enable-sse2) ;; - '1,0') - confadd=(--enable-mmx --disable-sse2) ;; - '0,1') - ewarn "You enabled SSE2 but have MMX disabled. This is an invalid." - ewarn "pixman will be built *without* MMX/SSE2 support." - confadd=(--disable-mmx --disable-sse2) ;; - '0,0') - confadd=(--disable-mmx --disable-sse2) ;; - esac - XORG_CONFIGURE_OPTIONS=( - "${confadd[@]}" + $(use_enable mmx) + $(use_enable sse2) $(use_enable altivec vmx) $(use_enable neon arm-neon) $(use_enable iwmmxt arm-iwmmxt) |