diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2012-03-05 22:19:51 +0000 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2012-03-05 22:19:51 +0000 |
| commit | 7305ca38422c028bfc03b6c5277c2870562e47e5 (patch) | |
| tree | 4156c732da3e4e72baa92c84fe46a29d13b5ff4e /app-crypt | |
| parent | Marking gtk+-2.24.8-r1 ppc for bug 393007 (diff) | |
| download | gentoo-2-7305ca38422c028bfc03b6c5277c2870562e47e5.tar.gz gentoo-2-7305ca38422c028bfc03b6c5277c2870562e47e5.tar.bz2 gentoo-2-7305ca38422c028bfc03b6c5277c2870562e47e5.zip | |
Use correct targets when xop and avx instructions sets are enabled (bugs #405927 and 405941, patch by Rick Farina).
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt')
| -rw-r--r-- | app-crypt/johntheripper/ChangeLog | 6 | ||||
| -rw-r--r-- | app-crypt/johntheripper/johntheripper-1.7.9.ebuild | 24 |
2 files changed, 26 insertions, 4 deletions
diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog index b22257417f1a..8c04eecf545f 100644 --- a/app-crypt/johntheripper/ChangeLog +++ b/app-crypt/johntheripper/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-crypt/johntheripper # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.134 2012/02/23 10:04:21 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.135 2012/03/05 22:19:51 radhermit Exp $ + + 05 Mar 2012; Tim Harder <radhermit@gentoo.org> johntheripper-1.7.9.ebuild: + Use correct targets when xop and avx instructions sets are enabled (bugs + #405927 and 405941, patch by Rick Farina). *johntheripper-1.7.9 (23 Feb 2012) diff --git a/app-crypt/johntheripper/johntheripper-1.7.9.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9.ebuild index b9be3eb34aad..2106cdf4e6a6 100644 --- a/app-crypt/johntheripper/johntheripper-1.7.9.ebuild +++ b/app-crypt/johntheripper/johntheripper-1.7.9.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/app-crypt/johntheripper/johntheripper-1.7.9.ebuild,v 1.1 2012/02/23 10:04:21 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9.ebuild,v 1.2 2012/03/05 22:19:51 radhermit Exp $ EAPI="4" @@ -36,11 +36,25 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_P}" +has_xop() { + echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __XOP__ 1" +} + +has_avx() { + echo | $(tc-getCC) ${CFLAGS} -E -dM - | grep -q "#define __AVX__ 1" +} + get_target() { if use alpha; then echo "linux-alpha" elif use amd64; then - echo "linux-x86-64" + if has_xop; then + echo "linux-x86-64-xop" + elif has_avx; then + echo "linux-x86-64-avx" + else + echo "linux-x86-64" + fi elif use ppc; then #if use altivec; then # echo "linux-ppc32-altivec" @@ -58,7 +72,11 @@ get_target() { elif use sparc; then echo "linux-sparc" elif use x86; then - if use sse2; then + if has_xop; then + echo "linux-x86-xop" + elif has_avx; then + echo "linux-x86-avx" + elif use sse2; then echo "linux-x86-sse2" elif use mmx; then echo "linux-x86-mmx" |