summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2020-06-09 09:53:11 +0000
committernia <nia@pkgsrc.org>2020-06-09 09:53:11 +0000
commit51ffb8f50f91afd74c1fc8f38a107eba54b1bfe0 (patch)
tree6e0cd557dc1f1a116b44dc6a8e4e0a34ed76d3fc /security
parent91745917c4e5a906ab704e7fb6ce298431b92c4a (diff)
downloadpkgsrc-51ffb8f50f91afd74c1fc8f38a107eba54b1bfe0.tar.gz
gnutls: fix detection of build options
Diffstat (limited to 'security')
-rw-r--r--security/gnutls/Makefile3
-rw-r--r--security/gnutls/buildlink3.mk8
2 files changed, 6 insertions, 5 deletions
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index f445f9e73e3..dbe9911274b 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.213 2020/06/08 19:48:14 leot Exp $
+# $NetBSD: Makefile,v 1.214 2020/06/09 09:53:11 nia Exp $
DISTNAME= gnutls-3.6.14
CATEGORIES= security devel
@@ -21,7 +21,6 @@ USE_TOOLS+= msgfmt msgmerge xgettext
GNU_CONFIGURE= yes
# this library duplicates (and conflicts with) openssl
CONFIGURE_ARGS+= --disable-openssl-compatibility
-CONFIGURE_ARGS+= --disable-libdane
CONFIGURE_ARGS+= --without-idn
CONFIGURE_ARGS+= --without-tpm
CONFIGURE_ARGS+= --disable-valgrind-tests
diff --git a/security/gnutls/buildlink3.mk b/security/gnutls/buildlink3.mk
index 95243ba55a0..f3f9ba9aa11 100644
--- a/security/gnutls/buildlink3.mk
+++ b/security/gnutls/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.38 2020/05/22 10:55:50 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.39 2020/06/09 09:53:11 nia Exp $
BUILDLINK_TREE+= gnutls
@@ -18,10 +18,12 @@ BUILDLINK_API_DEPENDS.nettle+= nettle>=3.4.1
.include "../../security/nettle/buildlink3.mk"
.include "../../security/p11-kit/buildlink3.mk"
.include "../../textproc/libunistring/buildlink3.mk"
-.if !empty(PKG_BUILD_OPTIONS.gnutls:Mdane)
+pkgbase := gnutls
+.include "../../mk/pkg-build-options.mk"
+.if ${PKG_BUILD_OPTIONS.gnutls:Mdane}
.include "../../net/unbound/buildlink3.mk"
.endif
-.if !empty(PKG_BUILD_OPTIONS.gnutls:Mguile)
+.if ${PKG_BUILD_OPTIONS.gnutls:Mguile}
.include "../../lang/guile22/buildlink3.mk"
.endif
.endif # GNUTLS_BUILDLINK3_MK