diff options
| author | tnn <tnn@pkgsrc.org> | 2019-02-06 11:36:38 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2019-02-06 11:36:38 +0000 |
| commit | c09586465e194ce3ad1d93d6d61e82fa59607c8c (patch) | |
| tree | e2138bfb920018fda6810c87afd2799253065f74 | |
| parent | edad3f0e275def1b1e530759baded83545259572 (diff) | |
| download | pkgsrc-c09586465e194ce3ad1d93d6d61e82fa59607c8c.tar.gz | |
heimdal: fix Linux PLIST.hcrypto issue in a more generic way
Tested under Debian unstable. PR pkg/53806
| -rw-r--r-- | security/heimdal/Makefile | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index 8717c470cc4..8bae01aaa3f 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.130 2019/01/06 12:53:56 bsiegert Exp $ +# $NetBSD: Makefile,v 1.131 2019/02/06 11:36:38 tnn Exp $ DISTNAME= heimdal-1.5.3 PKGREVISION= 19 @@ -67,27 +67,13 @@ CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.editlinereadline} CONFIGURE_ARGS+= --with-libedit=${BUILDLINK_PREFIX.editlinereadline} .endif -PLIST_VARS+= glob vis -.if ${OPSYS} == "SunOS" -PLIST.vis= yes -PLIST.glob= yes -.endif +PLIST_VARS+= glob vis hcrypto afskauth -PLIST_VARS+= hcrypto -# Linux does not have include/vis.h and expected include/glob.h. -.if ${OPSYS} == "Linux" +.if ${OPSYS} == "SunOS" 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 .if ${OPSYS} == "IRIX" PLIST.afskauth= yes .endif @@ -121,6 +107,18 @@ CHECK_BUILTIN.openssl:=no PLIST.hcrypto= yes .endif +# 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 !empty(USE_BUILTIN.openssl:Myes) && \ + empty(BUILTIN_VERSION.openssl:M1.0*) +PLIST.hcrypto= yes +.endif +.endif + .if ${OPSYS} == "MirBSD" .if !empty(USE_BUILTIN.openssl:Myes) PLIST.hcrypto= yes |