summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorFabrice Coulon <fabrice@axis.com>2014-10-03 10:21:49 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-10 16:44:31 +0100
commitc9ec3257cf0ccbb1580708bcf69de50f447452f2 (patch)
tree2cc2a63256d9bfd0ce8c3112ffa80003567a46a7 /meta
parentcc2add24f487b271c4e8e4878ac65a9c6e3a405e (diff)
downloadpoky-c9ec3257cf0ccbb1580708bcf69de50f447452f2.tar.gz
curl: add PACKAGECONFIG option to use libssh2
The user can enable libssh2 via conf/local.conf or custom distro configuration, this will pull in libssh2, which is not used by default. For example, a curl_x.y.z.bbappend file containing the following line: PACKAGECONFIG += "libssh2" (From OE-Core rev: d425e005d274cac0ef7160f53c41bda175444f69) Signed-off-by: Fabrice Coulon <fabrice.coulon@axis.com> Signed-off-by: Olof Johansson <olof.johansson@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/curl/curl_7.37.1.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-support/curl/curl_7.37.1.bb b/meta/recipes-support/curl/curl_7.37.1.bb
index e2852e39a5..39ded80190 100644
--- a/meta/recipes-support/curl/curl_7.37.1.bb
+++ b/meta/recipes-support/curl/curl_7.37.1.bb
@@ -28,9 +28,9 @@ PACKAGECONFIG[ssl] = "--with-ssl --with-random=/dev/urandom,--without-ssl,openss
28PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" 28PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls"
29PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib" 29PACKAGECONFIG[zlib] = "--with-zlib=${STAGING_LIBDIR}/../,--without-zlib,zlib"
30PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump" 30PACKAGECONFIG[rtmpdump] = "--with-librtmp,--without-librtmp,rtmpdump"
31PACKAGECONFIG[libssh2] = "--with-libssh2,--without-libssh2,libssh2"
31 32
32EXTRA_OECONF = "--without-libssh2 \ 33EXTRA_OECONF = "--without-libidn \
33 --without-libidn \
34 --enable-crypto-auth \ 34 --enable-crypto-auth \
35 --disable-ldap \ 35 --disable-ldap \
36 --disable-ldaps \ 36 --disable-ldaps \