diff options
| author |   Alon Bar-Lev <alonbl@gentoo.org> | 2007-11-13 20:13:26 +0000 |
|---|---|---|
| committer | Alon Bar-Lev <alonbl@gentoo.org> | 2007-11-13 20:13:26 +0000 |
| commit | 3a920eb0f0cb9afd4a653f00ef51f578bd0e6fa6 (patch) | |
| tree | 3d31163a1a97aaa54a7aeefaa1517d5a1aee39e0 /app-crypt/johntheripper | |
| parent | Version bump (diff) | |
| download | gentoo-2-3a920eb0f0cb9afd4a653f00ef51f578bd0e6fa6.tar.gz gentoo-2-3a920eb0f0cb9afd4a653f00ef51f578bd0e6fa6.tar.bz2 gentoo-2-3a920eb0f0cb9afd4a653f00ef51f578bd0e6fa6.zip | |
Remove funroll-loops patch, do this using argument to make
(Portage version: 2.1.3.19)
Diffstat (limited to 'app-crypt/johntheripper')
| -rw-r--r-- | app-crypt/johntheripper/ChangeLog | 7 | ||||
| -rw-r--r-- | app-crypt/johntheripper/files/johntheripper-1.7.2-funroll-loops.patch | 11 | ||||
| -rw-r--r-- | app-crypt/johntheripper/johntheripper-1.7.2-r2.ebuild | 10 |
3 files changed, 12 insertions, 16 deletions
diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog index 51cae138068d..a65fba69b79b 100644 --- a/app-crypt/johntheripper/ChangeLog +++ b/app-crypt/johntheripper/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-crypt/johntheripper # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.71 2007/11/13 17:36:13 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.72 2007/11/13 20:13:26 alonbl Exp $ + + 13 Nov 2007; Alon Bar-Lev <alonbl@gentoo.org> + -files/johntheripper-1.7.2-funroll-loops.patch, + johntheripper-1.7.2-r2.ebuild: + Remove funroll-loops patch, do this using argument to make 13 Nov 2007; Jeroen Roovers <jer@gentoo.org> +files/johntheripper-1.7.2-funroll-loops.patch, diff --git a/app-crypt/johntheripper/files/johntheripper-1.7.2-funroll-loops.patch b/app-crypt/johntheripper/files/johntheripper-1.7.2-funroll-loops.patch deleted file mode 100644 index 60c7e5e32118..000000000000 --- a/app-crypt/johntheripper/files/johntheripper-1.7.2-funroll-loops.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Makefile. 2007-11-13 18:15:57.000000000 +0100 -+++ src/Makefile 2007-11-13 18:19:57.990916160 +0100 -@@ -18,7 +18,7 @@ - CFLAGS = -c -Wall -O2 -fomit-frame-pointer -I/usr/local/include -L/usr/local/lib - ASFLAGS = -c - LDFLAGS = -s --OPT_NORMAL = -funroll-loops -+OPT_NORMAL = - OPT_INLINE = -finline-functions - LIBS = -L/usr/local/lib -L/usr/local/ssl/lib -lcrypto -lm - diff --git a/app-crypt/johntheripper/johntheripper-1.7.2-r2.ebuild b/app-crypt/johntheripper/johntheripper-1.7.2-r2.ebuild index 81338e9f1d3f..c4ce4edb0093 100644 --- a/app-crypt/johntheripper/johntheripper-1.7.2-r2.ebuild +++ b/app-crypt/johntheripper/johntheripper-1.7.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.2-r2.ebuild,v 1.13 2007/11/13 17:36:13 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.2-r2.ebuild,v 1.14 2007/11/13 20:13:26 alonbl Exp $ inherit eutils flag-o-matic toolchain-funcs pax-utils @@ -27,7 +27,7 @@ src_unpack() { cd "${S}" epatch "${WORKDIR}"/${MY_PNBASE}-1.7.2-all-7.diff - for p in sha1-memset stackdef.S stackdef-2.S mkdir-sandbox funroll-loops; do + for p in sha1-memset stackdef.S stackdef-2.S mkdir-sandbox; do epatch "${FILESDIR}/${P}-${p}.patch" done } @@ -41,11 +41,13 @@ src_compile() { strip-flags cd "${S}"/src - # Note this program uses AS and LD incorrectly + + # Remove default OPT_NORMAL -funroll-loops bug#198659 for unknown archs OPTIONS="CPP=$(tc-getCXX) CC=$(tc-getCC) AS=$(tc-getCC) LD=$(tc-getCC) \ CFLAGS=\"-c -Wall ${CFLAGS} -DJOHN_SYSTEMWIDE \ -DJOHN_SYSTEMWIDE_HOME=\\\"\\\\\\\"/etc/john\\\\\\\"\\\"\" \ - LDFLAGS=\"${LDFLAGS}\"" + LDFLAGS=\"${LDFLAGS}\" + OPT_NORMAL=\"\"" if use x86 ; then if use sse2 ; then |