diff options
| author | ryoon <ryoon@pkgsrc.org> | 2019-02-20 12:21:34 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2019-02-20 12:21:34 +0000 |
| commit | a6735524737d35c3736b025d6e3f7795ad1018d2 (patch) | |
| tree | 1e2f6231504c18391788f424e56146a32aa1a155 /net | |
| parent | 03372c8945e46f8a905358fb77c51578b2c8de65 (diff) | |
| download | pkgsrc-a6735524737d35c3736b025d6e3f7795ad1018d2.tar.gz | |
Fix build when security/cyrus-sasl is installed
Introduce sasl option (disabled by default) to inconsistent
detection of cyrus-sasl between CMAKE and CC.
Reported by NISHIMURA Takeshi.
Diffstat (limited to 'net')
| -rw-r--r-- | net/libvncserver/Makefile | 3 | ||||
| -rw-r--r-- | net/libvncserver/options.mk | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile index b790f189bec..757ccfb7a64 100644 --- a/net/libvncserver/Makefile +++ b/net/libvncserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2019/02/01 12:45:21 tnn Exp $ +# $NetBSD: Makefile,v 1.27 2019/02/20 12:21:34 ryoon Exp $ # DISTNAME= libvncserver-LibVNCServer-0.9.12 @@ -29,7 +29,6 @@ CMAKE_ARGS+= -DWITH_THREADS=ON CMAKE_ARGS+= -DWITH_TIGHTVNC_FILETRANSFER=ON CMAKE_ARGS+= -DWITH_WEBSOCKETS=ON CMAKE_ARGS+= -DWITH_24BPP=ON -CMAKE_ARGS+= -DWITH_SASL=ON CMAKE_ARGS+= -DWITH_LZO=ON CMAKE_ARGS+= -DWITH_ZLIB=ON CMAKE_ARGS+= -DWITH_JPEG=ON diff --git a/net/libvncserver/options.mk b/net/libvncserver/options.mk index 5973b1e685a..f599e798698 100644 --- a/net/libvncserver/options.mk +++ b/net/libvncserver/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.2 2019/02/01 12:45:21 tnn Exp $ +# $NetBSD: options.mk,v 1.3 2019/02/20 12:21:34 ryoon Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.libVNCServer -PKG_SUPPORTED_OPTIONS= gnutls inet6 libgcrypt openssl +PKG_SUPPORTED_OPTIONS= gnutls inet6 libgcrypt openssl sasl PKG_SUGGESTED_OPTIONS= gnutls inet6 libgcrypt PKG_OPTIONS_OPTIONAL_GROUPS+= ssl PKG_OPTIONS_GROUP.ssl= gnutls openssl @@ -34,3 +34,10 @@ CMAKE_ARGS+= -DWITH_OPENSSL=ON .else CMAKE_ARGS+= -DWITH_OPENSSL=OFF .endif + +.if !empty(PKG_OPTIONS:Msasl) +.include "../../security/cyrus-sasl/buildlink3.mk" +CMAKE_ARGS+= -DWITH_SASL=ON +.else +CMAKE_ARGS+= -DWITH_SASL=OFF +.endif |