diff options
-rw-r--r-- | mail-filter/procmail/ChangeLog | 6 | ||||
-rw-r--r-- | mail-filter/procmail/procmail-3.22-r9.ebuild | 25 |
2 files changed, 20 insertions, 11 deletions
diff --git a/mail-filter/procmail/ChangeLog b/mail-filter/procmail/ChangeLog index b69655aea6ac..c61ab97a658a 100644 --- a/mail-filter/procmail/ChangeLog +++ b/mail-filter/procmail/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for mail-filter/procmail # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/ChangeLog,v 1.29 2008/06/15 10:22:20 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/ChangeLog,v 1.30 2008/11/28 21:37:25 dertobi123 Exp $ + + 28 Nov 2008; Tobias Scherbaum <dertobi123@gentoo.org> + procmail-3.22-r9.ebuild: + Don't epatch in src_compile *procmail-3.22-r9 (15 Jun 2008) diff --git a/mail-filter/procmail/procmail-3.22-r9.ebuild b/mail-filter/procmail/procmail-3.22-r9.ebuild index 0721d92fbfc6..4ce56a54eb46 100644 --- a/mail-filter/procmail/procmail-3.22-r9.ebuild +++ b/mail-filter/procmail/procmail-3.22-r9.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/procmail-3.22-r9.ebuild,v 1.1 2008/06/15 10:22:20 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/procmail/procmail-3.22-r9.ebuild,v 1.2 2008/11/28 21:37:25 dertobi123 Exp $ inherit eutils flag-o-matic @@ -18,15 +18,9 @@ RDEPEND="virtual/libc selinux? ( sec-policy/selinux-procmail )" PROVIDE="virtual/mda" -src_compile() { - # -finline-functions (implied by -O3) leaves strstr() in an infinite loop. - # To work around this, we append -fno-inline-functions to CFLAGS - append-flags -fno-inline-functions - - sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS}:" \ - -e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \ - -e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" \ - -i Makefile || die "sed failed" +src_unpack() { + unpack ${A} + cd "${S}" # disable flock, using both fcntl and flock style locking # doesn't work with NFS with 2.6.17+ kernels, bug #156493 @@ -55,6 +49,17 @@ src_compile() { # Fix for bug #200006 epatch "${FILESDIR}/${PN}-pipealloc.diff" +} + +src_compile() { + # -finline-functions (implied by -O3) leaves strstr() in an infinite loop. + # To work around this, we append -fno-inline-functions to CFLAGS + append-flags -fno-inline-functions + + sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS}:" \ + -e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \ + -e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" \ + -i Makefile || die "sed failed" emake || die } |