summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2012-04-07 20:36:41 +0000
committerTim Harder <radhermit@gentoo.org>2012-04-07 20:36:41 +0000
commitacace51e8ea0ed3da1c23c7c9ab8766cf2707ab8 (patch)
tree7221bf32e713ab7be4f016ae07f08cfafcc53365 /app-crypt
parentBump dependency on pcsc-lite, thanks idl0r. (diff)
downloadgentoo-2-acace51e8ea0ed3da1c23c7c9ab8766cf2707ab8.tar.gz
gentoo-2-acace51e8ea0ed3da1c23c7c9ab8766cf2707ab8.tar.bz2
gentoo-2-acace51e8ea0ed3da1c23c7c9ab8766cf2707ab8.zip
Fix CFLAGS quoting build error.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/johntheripper/ChangeLog5
-rw-r--r--app-crypt/johntheripper/johntheripper-1.7.9-r1.ebuild5
2 files changed, 6 insertions, 4 deletions
diff --git a/app-crypt/johntheripper/ChangeLog b/app-crypt/johntheripper/ChangeLog
index 8a6309699ca5..600886607785 100644
--- a/app-crypt/johntheripper/ChangeLog
+++ b/app-crypt/johntheripper/ChangeLog
@@ -1,6 +1,9 @@
# 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.139 2012/04/07 06:44:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/ChangeLog,v 1.140 2012/04/07 20:36:41 radhermit Exp $
+
+ 07 Apr 2012; Tim Harder <radhermit@gentoo.org> johntheripper-1.7.9-r1.ebuild:
+ Fix CFLAGS quoting build error.
07 Apr 2012; Tim Harder <radhermit@gentoo.org> johntheripper-1.7.9.ebuild,
johntheripper-1.7.9-r1.ebuild:
diff --git a/app-crypt/johntheripper/johntheripper-1.7.9-r1.ebuild b/app-crypt/johntheripper/johntheripper-1.7.9-r1.ebuild
index b470fd3499fb..7439fee0bfc9 100644
--- a/app-crypt/johntheripper/johntheripper-1.7.9-r1.ebuild
+++ b/app-crypt/johntheripper/johntheripper-1.7.9-r1.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-r1.ebuild,v 1.3 2012/04/07 06:44:47 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/johntheripper/johntheripper-1.7.9-r1.ebuild,v 1.4 2012/04/07 20:36:41 radhermit Exp $
EAPI="4"
@@ -148,7 +148,6 @@ src_compile() {
echo "#define JOHN_SYSTEMWIDE_HOME \"${EPREFIX}/etc/john\"" >> config.gentoo
echo "#define JOHN_SYSTEMWIDE_EXEC \"${EPREFIX}/usr/libexec/john\"" >> config.gentoo
append-flags -fPIC -fPIE
- CFLAGS="${CFLAGS} -include \\\"${S}\\\"/config.gentoo"
gcc-specs-pie && append-ldflags -nopie
use openmp && OMP="-fopenmp"
@@ -157,7 +156,7 @@ src_compile() {
emake -C src/ \
CPP="${CPP}" CC="${CC}" AS="${AS}" LD="${LD}" \
- CFLAGS="-c -Wall ${CFLAGS} ${OMP}" \
+ CFLAGS="-c -Wall -include \\\"${S}\\\"/config.gentoo ${CFLAGS} ${OMP}" \
LDFLAGS="${LDFLAGS}" \
OPT_NORMAL="" \
OMPFLAGS="${OMP}" \