فهرست منبع

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>
Thomas Petazzoni 11 سال پیش
والد
کامیت
563f586e9a
2فایلهای تغییر یافته به همراه3 افزوده شده و 1 حذف شده
  1. 2 0
      package/flickcurl/Config.in
  2. 1 1
      package/flickcurl/flickcurl.mk

+ 2 - 0
package/flickcurl/Config.in

@@ -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

+ 1 - 1
package/flickcurl/flickcurl.mk

@@ -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