pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/security/heimdal heimdal: Fix compilation under WSL



details:   https://anonhg.NetBSD.org/pkgsrc/rev/e115f6e3825f
branches:  trunk
changeset: 327686:e115f6e3825f
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sun Jan 06 12:53:56 2019 +0000

description:
heimdal: Fix compilation under WSL

This sets the "hcrypto" PLIST variable correct when pkgsrc is used under
WSL (Windows Services for Linux).

>From David Weller-Fahy via PR pkg/53806.

diffstat:

 security/heimdal/Makefile |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (32 lines):

diff -r ec6e86232920 -r e115f6e3825f security/heimdal/Makefile
--- a/security/heimdal/Makefile Sun Jan 06 12:51:45 2019 +0000
+++ b/security/heimdal/Makefile Sun Jan 06 12:53:56 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2018/12/09 18:52:07 adam Exp $
+# $NetBSD: Makefile,v 1.130 2019/01/06 12:53:56 bsiegert Exp $
 
 DISTNAME=      heimdal-1.5.3
 PKGREVISION=   19
@@ -73,15 +73,21 @@
 PLIST.glob=    yes
 .endif
 
+PLIST_VARS+=           hcrypto
 # Linux does not have include/vis.h and expected include/glob.h.
 .if ${OPSYS} == "Linux"
 PLIST.vis=     yes
 PLIST.glob=    yes
 # Without this I get undefined references to pthread_getspecific
 PTHREAD_AUTO_VARS=     yes
+.if ${OS_VARIANT} == "Microsoft"
+# On Ubuntu hosted via WSL this is needed to avoid a DESTDIR/PLIST
+# conflict error.
+PLIST.hcrypto= yes
+.endif
 .endif
 
-PLIST_VARS+=           afskauth hcrypto
+PLIST_VARS+=           afskauth
 .if ${OPSYS} == "IRIX"
 PLIST.afskauth=                yes
 .endif



Home | Main Index | Thread Index | Old Index