diff options
| author | sbd <sbd> | 2011-10-31 22:58:45 +0000 |
|---|---|---|
| committer | sbd <sbd> | 2011-10-31 22:58:45 +0000 |
| commit | 87dd0da828b6dfea446fe6bfb0f392919e403cf8 (patch) | |
| tree | a3dd302952359da1f6bfaa7880ffeb73d05fe19b | |
| parent | 97105c3809817b37e8e5ce5af028bc669592829e (diff) | |
| download | pkgsrc-87dd0da828b6dfea446fe6bfb0f392919e403cf8.tar.gz | |
The infinite loop noted in PR#30999 is cause by inlining functions on
any system, so inline functions should alway be disabled.
| -rw-r--r-- | mail/procmail/Makefile | 6 | ||||
| -rw-r--r-- | mail/procmail/hacks.mk | 10 |
2 files changed, 5 insertions, 11 deletions
diff --git a/mail/procmail/Makefile b/mail/procmail/Makefile index 6cfd1682fc8..015e5baa2ca 100644 --- a/mail/procmail/Makefile +++ b/mail/procmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2010/01/27 18:14:05 joerg Exp $ +# $NetBSD: Makefile,v 1.46 2011/10/31 22:58:45 sbd Exp $ # DISTNAME= procmail-3.22 @@ -30,6 +30,10 @@ PROCMAIL_TRUSTED_IDS?=\ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 +### Inlining functions (implied by -O3 or higher) cause the strstr() test +### to enter an infinite loop so disable it. This fixes PR pkg/30999. +CFLAGS+= -fno-inline-functions + pre-configure: ${ECHO} "#define TRUSTED_IDS {${PROCMAIL_TRUSTED_IDS:Q}}" \ >> ${WRKSRC}/config.h diff --git a/mail/procmail/hacks.mk b/mail/procmail/hacks.mk deleted file mode 100644 index 01855ab68d1..00000000000 --- a/mail/procmail/hacks.mk +++ /dev/null @@ -1,10 +0,0 @@ -# $NetBSD: hacks.mk,v 1.1 2005/12/23 04:36:45 jlam Exp $ - -### [Fri Dec 23 04:33:11 UTC 2005 : jlam] -### Inlining functions seems to cause strstr() to enter an infinite loop -### on Solaris, so disable it. This fixes PR pkg/30999. -### -.if ${OPSYS} == "SunOS" -PKG_HACKS+= solaris-inline -CFLAGS+= -fno-inline-functions -.endif |