summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-04-05 04:55:22 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-04-05 04:55:22 +0000
commit8e7842b06b19164efd2ea527938016f950433b60 (patch)
tree845d6982c273d20e4526c45c89a054e2f7be306f /app-crypt
parentFix from upstream for handling of little endian fortran on SuperH #264303 by ... (diff)
downloadgentoo-2-8e7842b06b19164efd2ea527938016f950433b60.tar.gz
gentoo-2-8e7842b06b19164efd2ea527938016f950433b60.tar.bz2
gentoo-2-8e7842b06b19164efd2ea527938016f950433b60.zip
Don't pre-strip files (bug #248715).
(Portage version: 13288-svn/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/johntheripper/ChangeLog6
-rw-r--r--app-crypt/johntheripper/johntheripper-1.7.3.1.ebuild9
2 files changed, 9 insertions, 6 deletions
diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 75d9260e71b7..51d62756ec20 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-crypt/johntheripper
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.89 2009/03/03 13:54:27 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.90 2009/04/05 04:55:22 arfrever Exp $
+
+ 05 Apr 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ johntheripper-1.7.3.1.ebuild:
+ Don't pre-strip files (bug #248715).
03 Mar 2009; Peter Volkov <pva@gentoo.org> johntheripper-1.7.3.1.ebuild:
~mips keyword back, bug #227631.
diff --git a/app-crypt/johntheripper/johntheripper-1.7.3.1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.3.1.ebuild
index 43f74b29a649..d2ec86b929c7 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.3.1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.3.1.ebuild,v 1.2 2009/03/03 13:54:27 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.3.1.ebuild,v 1.3 2009/04/05 04:55:22 arfrever Exp $
inherit eutils flag-o-matic toolchain-funcs pax-utils
@@ -90,7 +90,7 @@ src_unpack() {
epatch "${FILESDIR}/${P}-${p}.patch"
done
- sed -i "s/LDFLAGS *= */override LDFLAGS += /" Makefile
+ sed -e "s/LDFLAGS *= */override LDFLAGS += /" -e "/LDFLAGS/s/-s//" -i Makefile || die "sed Makefile failed"
}
src_compile() {
@@ -104,12 +104,11 @@ src_compile() {
use mpi && CPP=mpicxx CC=mpicc AS=mpicc LD=mpicc
emake \
CPP=${CPP} CC=${CC} AS=${AS} LD=${LD} \
- CFLAGS="-c -Wall ${CFLAGS} -DJOHN_SYSTEMWIDE \
- -DJOHN_SYSTEMWIDE_HOME=\"\\\"/etc/john\\\"\"" \
+ CFLAGS="-c -Wall ${CFLAGS} -DJOHN_SYSTEMWIDE -DJOHN_SYSTEMWIDE_HOME=\"\\\"/etc/john\\\"\"" \
LDFLAGS="${LDFLAGS}" \
OPT_NORMAL="" \
$(get_target) \
- || die "make failed"
+ || die "emake failed"
}
src_test() {