gitolite/buildrootschalter
gitolite
/
buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

flickcurl: adjust openssl dependency 

flickcurl does not specifically need openssl: it needs libcurl to have
crypto support to access https:// URLs. So, instead of depending on
openssl in FLICKCURL_DEPENDENCIES, this commit simply leaves it to the
Config.in file to select either OpenSSL, gnutls or libnss to make sure
libcurl will use one of these libraries.

Reported-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2014-07-28 23:26:53 +02:00
parent 58441cfd48
commit 563f586e9a
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/flickcurl/Config.in
View File

@ -2,6 +2,8 @@ config BR2_PACKAGE_FLICKCURL
bool "flickcurl"
select BR2_PACKAGE_LIBCURL
select BR2_PACKAGE_LIBXML2
# Ensure that libcurl is built with crypto support, since
# flickcurl must access https:// URLs.
select BR2_PACKAGE_OPENSSL if !(BR2_PACKAGE_GNUTLS || BR2_PACKAGE_LIBNSS)
select BR2_PACKAGE_CA_CERTIFICATES # runtime
help

2
package/flickcurl/flickcurl.mk
View File

@ -11,7 +11,7 @@ FLICKCURL_LICENSE_FILES = COPYING COPYING.LIB LICENSE-2.0.txt LICENSE.html
FLICKCURL_INSTALL_STAGING = YES
FLICKCURL_CONFIG_SCRIPTS = flickcurl-config
FLICKCURL_CONF_OPT = --without-curl-config --without-xml2-config --without-raptor
FLICKCURL_DEPENDENCIES = libcurl libxml2 openssl host-pkgconf
FLICKCURL_DEPENDENCIES = libcurl libxml2 host-pkgconf
ifeq ($(BR2_PACKAGE_FLICKCURL_UTILS),)
define FLICKCURL_REMOVE_UTILS