diff options
| author |   Rick Farina <zerochaos@gentoo.org> | 2013-09-19 19:44:58 +0000 |
|---|---|---|
| committer | Rick Farina <zerochaos@gentoo.org> | 2013-09-19 19:44:58 +0000 |
| commit | 198afd5edfac5a2f3cb3a02e0aaa081d7097e3c4 (patch) | |
| tree | d1d19c8c41e491ffa0ec4ec9b6f7268ff190e31d /app-crypt/johntheripper | |
| parent | they put the CVE-2013-4222 fix in stable/grizzly https://github.com/openstack... (diff) | |
| download | gentoo-2-198afd5edfac5a2f3cb3a02e0aaa081d7097e3c4.tar.gz gentoo-2-198afd5edfac5a2f3cb3a02e0aaa081d7097e3c4.tar.bz2 gentoo-2-198afd5edfac5a2f3cb3a02e0aaa081d7097e3c4.zip | |
re-adjust compiler check in manner more preferred by co-maintainer
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key DD11F94A)
Diffstat (limited to 'app-crypt/johntheripper')
| -rw-r--r-- | app-crypt/johntheripper/ChangeLog | 5 | ||||
| -rw-r--r-- | app-crypt/johntheripper/johntheripper-1.7.9-r8.ebuild | 9 |
2 files changed, 10 insertions, 4 deletions
diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog index e21b9c59db5d..13af3b350014 100644 --- a/app-crypt/johntheripper/ChangeLog +++ b/app-crypt/johntheripper/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-crypt/johntheripper # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.162 2013/09/19 18:52:23 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.163 2013/09/19 19:44:58 zerochaos Exp $ + + 19 Sep 2013; Rick Farina <zerochaos@gentoo.org> johntheripper-1.7.9-r8.ebuild: + re-adjust compiler check in manner more preferred by co-maintainer 19 Sep 2013; Rick Farina <zerochaos@gentoo.org> johntheripper-1.7.9-r8.ebuild: moving gcc checks to src_prepare to avoid affecting binpkgs diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r8.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r8.ebuild index 000876bd8c15..3f7518832b01 100644 --- a/app-crypt/johntheripper/johntheripper-1.7.9-r8.ebuild +++ b/app-crypt/johntheripper/johntheripper-1.7.9-r8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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-r8.ebuild,v 1.3 2013/09/19 18:52:23 zerochaos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r8.ebuild,v 1.4 2013/09/19 19:44:58 zerochaos Exp $ EAPI="5" @@ -124,10 +124,13 @@ get_john_objs() { fi } -src_prepare() { - if use openmp ; then +pkg_setup() { + if use openmp && [[ ${MERGE_TYPE} != binary ]]; then tc-has-openmp || die "Please switch to an openmp compatible compiler" fi +} + +src_prepare() { if ! use minimal; then epatch "${WORKDIR}/${MY_P}-${JUMBO}.diff" |