aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2015-12-02 10:13:12 +0800
committerArmin Kuster <akuster808@gmail.com>2015-12-20 14:25:42 -0800
commit9af04860be7697694ecd1cfb0a948a186ac86727 (patch)
tree9eead666017f004a3481cc20e2777b528792f06f
parent6cc7fbfc3b68e39aab34c1599c2dce9e1ee49e08 (diff)
downloadmeta-openembedded-contrib-9af04860be7697694ecd1cfb0a948a186ac86727.tar.gz
libssh2: make crypto library selectable
Add PACKAGECONFs 'openssl' and 'gcrypt' to make crypto library selectable. Only one of them could be set. If they are both set, 'gcrypt' is invalide. Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-support/libssh2/libssh2_1.6.0.bb10
1 files changed, 7 insertions, 3 deletions
diff --git a/meta-oe/recipes-support/libssh2/libssh2_1.6.0.bb b/meta-oe/recipes-support/libssh2/libssh2_1.6.0.bb
index 4f03b999e6..c43164e5d5 100644
--- a/meta-oe/recipes-support/libssh2/libssh2_1.6.0.bb
+++ b/meta-oe/recipes-support/libssh2/libssh2_1.6.0.bb
@@ -2,7 +2,7 @@ SUMMARY = "A client-side C library implementing the SSH2 protocol"
HOMEPAGE = "http://www.libssh2.org/"
SECTION = "libs"
-DEPENDS = "zlib openssl"
+DEPENDS = "zlib"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=c5cf34fc0acb44b082ef50ef5e4354ca"
@@ -13,8 +13,12 @@ SRC_URI[sha256sum] = "5a202943a34a1d82a1c31f74094f2453c207bf9936093867f41414968c
inherit autotools pkgconfig
-EXTRA_OECONF += "--with-openssl \
+EXTRA_OECONF += "\
--with-libz \
- --with-libssl-prefix=${STAGING_LIBDIR} \
--with-libz-prefix=${STAGING_LIBDIR} \
"
+
+# only one of openssl and gcrypt could be set
+PACKAGECONFIG ??= "openssl"
+PACKAGECONFIG[openssl] = "--with-openssl --with-libssl-prefix=${STAGING_LIBDIR},--without-openssl,openssl"
+PACKAGECONFIG[gcrypt] = "--with-libgcrypt --with-libgcrypt-prefix=${STAGING_EXECPREFIXDIR},--without-libgcrypt,libgcrypt"