pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/security/libssh libssh: fix options.mk for current cma...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/3784d3768332
branches:  trunk
changeset: 374582:3784d3768332
user:      markd <markd%pkgsrc.org@localhost>
date:      Thu Jan 25 19:52:38 2018 +0000

description:
libssh: fix options.mk for current cmake based build

diffstat:

 security/libssh/options.mk |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (29 lines):

diff -r 3fc75507d66f -r 3784d3768332 security/libssh/options.mk
--- a/security/libssh/options.mk        Thu Jan 25 19:37:37 2018 +0000
+++ b/security/libssh/options.mk        Thu Jan 25 19:52:38 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: options.mk,v 1.2 2015/11/18 21:00:51 christos Exp $
+# $NetBSD: options.mk,v 1.3 2018/01/25 19:52:38 markd Exp $
 
-PKG_OPTIONS_VAR=               PKG_OPTIONS.${PKGNAME}
+PKG_OPTIONS_VAR=               PKG_OPTIONS.libssh
 PKG_OPTIONS_REQUIRED_GROUPS=   crypto
 PKG_OPTIONS_GROUP.crypto=      openssl libgcrypt
 #PKG_SUPPORTED_OPTIONS=                compression
@@ -16,14 +16,12 @@
 
 .if !empty(PKG_OPTIONS:Mopenssl)
 BUILDLINK_API_DEPENDS.openssl+=        openssl>=0.9.8
-CONFIGURE_ARGS+=               --with-libgcrypt=no
-CONFIGURE_ARGS+=               --with-openssl=${SSLBASE:Q}
+CMAKE_ARGS+=           -DWITH_GCRYPT:BOOL=OFF
 .include "../../security/openssl/buildlink3.mk"
 .endif
 
 .if !empty(PKG_OPTIONS:Mlibgcrypt)
 BUILDLINK_API_DEPENDS.libgcrypt+=      libgcrypt>=1.4
-CONFIGURE_ARGS+=               --with-libgcrypt=${BUILDLINK_PREFIX.libgcrypt:Q}
-CONFIGURE_ARGS+=               --with-openssl=no
+CMAKE_ARGS+=           -DWITH_GCRYPT:BOOL=ON
 .include "../../security/libgcrypt/buildlink3.mk"
 .endif



Home | Main Index | Thread Index | Old Index