pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/imap-uw fix compilation on Darwin with kerberos



details:   https://anonhg.NetBSD.org/pkgsrc/rev/372d87e3e8c7
branches:  trunk
changeset: 375602:372d87e3e8c7
user:      jdolecek <jdolecek%pkgsrc.org@localhost>
date:      Fri Feb 16 22:06:58 2018 +0000

description:
fix compilation on Darwin with kerberos

when EXTRAAUTHENTICATORS is passed as MAKE_FLAGS, it ends up being
doubled, mkauths then generates auths.c with doubled auth_gss.c and
auth_mit.c twice, triggering duplicate definition errors with clang
9.0.0; pass via MAKE_ENV instead

bump PKGREVISION

diffstat:

 mail/imap-uw/Makefile   |  4 ++--
 mail/imap-uw/options.mk |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 74c1c95d0d48 -r 372d87e3e8c7 mail/imap-uw/Makefile
--- a/mail/imap-uw/Makefile     Fri Feb 16 17:14:07 2018 +0000
+++ b/mail/imap-uw/Makefile     Fri Feb 16 22:06:58 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.144 2017/06/02 05:35:21 taca Exp $
+# $NetBSD: Makefile,v 1.145 2018/02/16 22:06:58 jdolecek Exp $
 #
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
@@ -11,7 +11,7 @@
 
 DISTNAME=      imap-2007f
 PKGNAME=       ${DISTNAME:S/-/-uw-/}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    mail
 MASTER_SITES=  ftp://ftp.cac.washington.edu/imap/
 EXTRACT_SUFX=  .tar.Z
diff -r 74c1c95d0d48 -r 372d87e3e8c7 mail/imap-uw/options.mk
--- a/mail/imap-uw/options.mk   Fri Feb 16 17:14:07 2018 +0000
+++ b/mail/imap-uw/options.mk   Fri Feb 16 22:06:58 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2009/05/26 11:32:22 obache Exp $
+# $NetBSD: options.mk,v 1.8 2018/02/16 22:06:58 jdolecek Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -37,7 +37,7 @@
 .if !empty(PKG_OPTIONS:Mkerberos)
 .  include "../../mk/krb5.buildlink3.mk"
 MAKE_ENV+=     KRB5_TYPE=${KRB5_TYPE}
-MAKE_FLAGS+=   EXTRAAUTHENTICATORS=gss
+MAKE_ENV+=     EXTRAAUTHENTICATORS=gss
 EXTRASPECIALS+=        GSSDIR=${KRB5BASE}
 CFLAGS.heimdal=        -DHEIMDAL_KRB5
 CFLAGS+=       ${CFLAGS.${KRB5_TYPE}}



Home | Main Index | Thread Index | Old Index